diff --git a/app/main.py b/app/main.py
index 1eaa373..0030a54 100644
--- a/app/main.py
+++ b/app/main.py
@@ -292,25 +292,29 @@ app.include_router(
 
 # BEGIN: CORS
 origins = [
-    'http://fastapi.localhost',
-    'http://localhost',
+    'https://oneskyit.com',
     'http://192.168.32.20:3000',
     'http://192.168.32.20:8080',
+    'http://fastapi.localhost',
+    'http://localhost',
     'http://localhost:3000',
     'http://localhost:5000',
     'http://localhost:8080',
-    'http://fastapi.localhost:5000',
-    'http://demo.localhost:5000',
     'http://localhost:7800',
-    'https://oneskyit.com',
-    'https://dev.oneskyit.com',
+    'http://cmsc.home:5000',
+    'http://cmsc.localhost:5000',
+    'http://connect.home:5000',
+    'http://connect.localhost:5000',
+    'http://demo.home:5000',
+    'http://demo.localhost:5000',
     'http://dev-idaa.home:5000',
     'http://dev-idaa.localhost:5000',
     'http://dev.home:5000',
-    'http://connect.home:5000',
-    'http://connect.localhost:5000',
+    'http://fastapi.localhost:5000',
     'http://idaa.home:5000',
     'http://idaa.localhost:5000',
+    'http://ishlt.home:5000',
+    'http://ishlt.localhost:5000',
     'http://svelte.localhost:5555',
 ]
 
diff --git a/app/models/membership_person_models.py b/app/models/membership_person_models.py
index a486c08..aebce04 100644
--- a/app/models/membership_person_models.py
+++ b/app/models/membership_person_models.py
@@ -36,10 +36,10 @@ class Membership_Person_Base(BaseModel):
     account_id: Optional[int]
 
     lu_membership_person_status_id: Optional[int] = Field( # lu_membership_person_status_id
-        alias = 'status_id'
+        alias = 'membership_person_status_id'
         )
     membership_person_status_name: Optional[str] = Field(
-        alias = 'status_name'
+        # alias = 'status_name'
         )
 
     # membership_group_id_random: Optional[str] = Field(
@@ -53,10 +53,10 @@ class Membership_Person_Base(BaseModel):
     #     )
 
     membership_group_person_id_random: Optional[str] = Field(
-        alias = 'group_person_id_random',
+        # alias = 'group_person_id_random',
         ) # NOTE: This is not optional
     membership_group_person_id: Optional[int] = Field(
-        alias = 'group_person_id',
+        # alias = 'group_person_id',
         ) # NOTE: This is not optional
 
     membership_group_person_name: Optional[str] = Field(
@@ -77,10 +77,10 @@ class Membership_Person_Base(BaseModel):
     #     )
 
     membership_type_person_id_random: Optional[str] = Field(
-        alias = 'type_person_id_random',
+        # alias = 'type_person_id_random',
         ) # NOTE: This is not optional
     membership_type_person_id: Optional[int] = Field(
-        alias = 'type_person_id',
+        # alias = 'type_person_id',
         ) # NOTE: This is not optional
 
     membership_type_person_name: Optional[str] = Field(
@@ -111,15 +111,15 @@ class Membership_Person_Base(BaseModel):
 
     level: Optional[int] = Field(0, ge=0, lt=150)
 
-    first_application_start_on: Optional[datetime.datetime]
-    # application_start_on: Optional[datetime.datetime]
-    first_approved_on: Optional[datetime.datetime]
-    first_start_on: Optional[datetime.datetime]
-    start_buffer_on: Optional[datetime.datetime]
-    start_on: Optional[datetime.datetime]
-    end_on: Optional[datetime.datetime]
-    end_buffer_on: Optional[datetime.datetime]
-    last_end_on: Optional[datetime.datetime]
+    first_application_start_on: Optional[Union[datetime.datetime,None]]
+    # application_start_on: Optional[Union[datetime.datetime,None]]
+    first_approved_on: Optional[Union[datetime.datetime,None]]
+    first_start_on: Optional[Union[datetime.datetime,None]]
+    start_buffer_on: Optional[Union[datetime.datetime,None]]
+    start_on: Optional[Union[datetime.datetime,None]]
+    end_on: Optional[Union[datetime.datetime,None]]
+    end_buffer_on: Optional[Union[datetime.datetime,None]]
+    last_end_on: Optional[Union[datetime.datetime,None]]
 
     flag: Optional[bool]
     flag_message: Optional[str]