diff --git a/backend/dataconnect/connector/connector.yaml b/backend/dataconnect/connector/connector.yaml
index c467ce2b..1cf85dcd 100644
--- a/backend/dataconnect/connector/connector.yaml
+++ b/backend/dataconnect/connector/connector.yaml
@@ -1,5 +1,5 @@
 connectorId: example
 generate:
   dartSdk:
-    - outputDir: ../../../apps/packages/data_connect/lib/src/dataconnect_generated
+    - outputDir: ../../../apps/mobile/packages/data_connect/lib/src/dataconnect_generated
       package: dataconnect_generated/generated.dart
diff --git a/backend/dataconnect/connector/team/mutations.gql b/backend/dataconnect/connector/team/mutations.gql
index 2f29e088..70c87e5a 100644
--- a/backend/dataconnect/connector/team/mutations.gql
+++ b/backend/dataconnect/connector/team/mutations.gql
@@ -1,6 +1,6 @@
 mutation createTeam(
   $teamName: String!
-  $ownerId: String!
+  $ownerId: UUID!
   $ownerName: String!
   $ownerRole: String!
   $email: String
diff --git a/backend/dataconnect/connector/team/queries.gql b/backend/dataconnect/connector/team/queries.gql
index 63fd2771..85ac4764 100644
--- a/backend/dataconnect/connector/team/queries.gql
+++ b/backend/dataconnect/connector/team/queries.gql
@@ -44,7 +44,7 @@ query getTeamById($id: UUID!) @auth(level: USER) {
   }
 }
 
-query getTeamsByOwnerId($ownerId: String!) @auth(level: USER) {
+query getTeamsByOwnerId($ownerId: UUID!) @auth(level: USER) {
   teams(where: { ownerId: { eq: $ownerId } }) {
     id
     teamName
diff --git a/backend/dataconnect/connector/teamHub/mutations.gql b/backend/dataconnect/connector/teamHub/mutations.gql
index b145c46f..9569aa79 100644
--- a/backend/dataconnect/connector/teamHub/mutations.gql
+++ b/backend/dataconnect/connector/teamHub/mutations.gql
@@ -3,9 +3,9 @@ mutation createTeamHub(
   $hubName: String!
   $address: String!
   $city: String!
-  $state: String!
-  $zipCode: String!
-  $managerName: String!
+  $state: String
+  $zipCode: String
+  $managerName: String
   $isActive: Boolean
   $departments: Any
 ) @auth(level: USER) {
diff --git a/backend/dataconnect/connector/teamHub/queries.gql b/backend/dataconnect/connector/teamHub/queries.gql
index 240a17b1..697b50c3 100644
--- a/backend/dataconnect/connector/teamHub/queries.gql
+++ b/backend/dataconnect/connector/teamHub/queries.gql
@@ -56,7 +56,7 @@ query getTeamHubsByTeamId($teamId: UUID!) @auth(level: USER) {
 # LIST TEAM HUBS BY OWNER (Vendor/Business)
 # ------------------------------------------------------------
 query listTeamHubsByOwnerId(
-  $ownerId: String!
+  $ownerId: UUID!
 ) @auth(level: USER) {
   teamHubs(
     where: {
diff --git a/backend/dataconnect/schema/team.gql b/backend/dataconnect/schema/team.gql
index e747e6b5..ccfb2d8a 100644
--- a/backend/dataconnect/schema/team.gql
+++ b/backend/dataconnect/schema/team.gql
@@ -3,7 +3,7 @@ type Team @table(name: "teams") {
   id: UUID! @default(expr: "uuidV4()")
   teamName: String!
   
-  ownerId: String! #vendor/business
+  ownerId: UUID! #vendor/business
   ownerName: String!
   ownerRole: String!
   email: String
diff --git a/backend/dataconnect/schema/teamHub.gql b/backend/dataconnect/schema/teamHub.gql
index fada65a5..01a79da2 100644
--- a/backend/dataconnect/schema/teamHub.gql
+++ b/backend/dataconnect/schema/teamHub.gql
@@ -7,9 +7,9 @@ type TeamHub @table(name: "team_hubs") {
   hubName: String!
   address: String!
   city: String!
-  state: String!
-  zipCode: String!
-  managerName: String!
+  state: String
+  zipCode: String
+  managerName: String
   isActive: Boolean! @default(expr: "true")
   departments: Any