diff --git a/src/Speckle.Core/Api/GraphQL/Inputs/VersionInputs.cs b/src/Speckle.Core/Api/GraphQL/Inputs/VersionInputs.cs
index 5bbee6e7..c0c50893 100644
--- a/src/Speckle.Core/Api/GraphQL/Inputs/VersionInputs.cs
+++ b/src/Speckle.Core/Api/GraphQL/Inputs/VersionInputs.cs
@@ -7,3 +7,20 @@ public sealed record UpdateVersionInput(string versionId, string? message);
 public sealed record MoveVersionsInput(string targetModelName, IReadOnlyList<string> versionIds);
 
 public sealed record DeleteVersionsInput(IReadOnlyList<string> versionIds);
+
+public sealed record CreateVersionInput(
+  string objectId,
+  string modelId,
+  string projectId,
+  string? message = null,
+  string? sourceApplication = ".net",
+  int? totalChildrenCount = null,
+  IReadOnlyList<string>? parents = null
+);
+
+public sealed record MarkReceivedVersionInput(
+  string versionId,
+  string projectId,
+  string sourceApplication,
+  string? message = null
+);
diff --git a/src/Speckle.Core/Api/GraphQL/Legacy/Client.GraphqlCleintOperations/Client.ObjectOperations.cs b/src/Speckle.Core/Api/GraphQL/Legacy/Client.GraphqlCleintOperations/Client.ObjectOperations.cs
index 0f842bc5..79e9f8b9 100644
--- a/src/Speckle.Core/Api/GraphQL/Legacy/Client.GraphqlCleintOperations/Client.ObjectOperations.cs
+++ b/src/Speckle.Core/Api/GraphQL/Legacy/Client.GraphqlCleintOperations/Client.ObjectOperations.cs
@@ -6,7 +6,6 @@ namespace Speckle.Core.Api;
 
 public partial class Client
 {
-  //TODO: API Gap
   /// <summary>
   /// Gets data about the requested Speckle object from a stream.
   /// </summary>
diff --git a/src/Speckle.Core/Api/GraphQL/Legacy/LegacyGraphQLModels.cs b/src/Speckle.Core/Api/GraphQL/Legacy/LegacyGraphQLModels.cs
index 5dcff259..180c7285 100644
--- a/src/Speckle.Core/Api/GraphQL/Legacy/LegacyGraphQLModels.cs
+++ b/src/Speckle.Core/Api/GraphQL/Legacy/LegacyGraphQLModels.cs
@@ -10,11 +10,11 @@ namespace Speckle.Core.Api;
 
 internal static class DeprecationMessages
 {
-  public const string FE2_DEPRECATION_MESSAGE =
+  public const string FE1_DEPRECATION_MESSAGE =
     $"Stream/Branch/Commit API is now deprecated, Use the new Project/Model/Version API functions in {nameof(Client)}";
 }
 
-[Obsolete(DeprecationMessages.FE2_DEPRECATION_MESSAGE)]
+[Obsolete(DeprecationMessages.FE1_DEPRECATION_MESSAGE)]
 public class StreamCreateInput
 {
   public string name { get; set; }
@@ -22,7 +22,7 @@ public class StreamCreateInput
   public bool isPublic { get; set; } = true;
 }
 
-[Obsolete(DeprecationMessages.FE2_DEPRECATION_MESSAGE)]
+[Obsolete(DeprecationMessages.FE1_DEPRECATION_MESSAGE)]
 public class StreamUpdateInput
 {
   public string id { get; set; }
@@ -31,7 +31,7 @@ public class StreamUpdateInput
   public bool isPublic { get; set; } = true;
 }
 
-[Obsolete(DeprecationMessages.FE2_DEPRECATION_MESSAGE)]
+[Obsolete(DeprecationMessages.FE1_DEPRECATION_MESSAGE)]
 public class StreamPermissionInput
 {
   public string streamId { get; set; }
@@ -39,14 +39,14 @@ public class StreamPermissionInput
   public string role { get; set; }
 }
 
-[Obsolete(DeprecationMessages.FE2_DEPRECATION_MESSAGE)]
+[Obsolete(DeprecationMessages.FE1_DEPRECATION_MESSAGE)]
 public class StreamRevokePermissionInput
 {
   public string streamId { get; set; }
   public string userId { get; set; }
 }
 
-[Obsolete(DeprecationMessages.FE2_DEPRECATION_MESSAGE)]
+[Obsolete(DeprecationMessages.FE1_DEPRECATION_MESSAGE)]
 public class StreamInviteCreateInput
 {
   public string streamId { get; set; }
@@ -56,7 +56,7 @@ public class StreamInviteCreateInput
   public string role { get; set; }
 }
 
-[Obsolete(DeprecationMessages.FE2_DEPRECATION_MESSAGE)]
+[Obsolete(DeprecationMessages.FE1_DEPRECATION_MESSAGE)]
 public class BranchCreateInput
 {
   public string streamId { get; set; }
@@ -64,7 +64,7 @@ public class BranchCreateInput
   public string description { get; set; }
 }
 
-[Obsolete(DeprecationMessages.FE2_DEPRECATION_MESSAGE)]
+[Obsolete(DeprecationMessages.FE1_DEPRECATION_MESSAGE)]
 public class BranchUpdateInput
 {
   public string streamId { get; set; }
@@ -73,13 +73,14 @@ public class BranchUpdateInput
   public string description { get; set; }
 }
 
-[Obsolete(DeprecationMessages.FE2_DEPRECATION_MESSAGE)]
+[Obsolete(DeprecationMessages.FE1_DEPRECATION_MESSAGE)]
 public class BranchDeleteInput
 {
   public string streamId { get; set; }
   public string id { get; set; }
 }
 
+[Obsolete(DeprecationMessages.FE1_DEPRECATION_MESSAGE)]
 public class CommitCreateInput
 {
   public string streamId { get; set; }
@@ -94,7 +95,7 @@ public class CommitCreateInput
   public List<string> previousCommitIds { get; set; }
 }
 
-[Obsolete(DeprecationMessages.FE2_DEPRECATION_MESSAGE)]
+[Obsolete(DeprecationMessages.FE1_DEPRECATION_MESSAGE)]
 public class CommitUpdateInput
 {
   public string streamId { get; set; }
@@ -102,14 +103,14 @@ public class CommitUpdateInput
   public string message { get; set; }
 }
 
-[Obsolete(DeprecationMessages.FE2_DEPRECATION_MESSAGE)]
+[Obsolete(DeprecationMessages.FE1_DEPRECATION_MESSAGE)]
 public class CommitDeleteInput
 {
   public string streamId { get; set; }
   public string id { get; set; }
 }
 
-[Obsolete(DeprecationMessages.FE2_DEPRECATION_MESSAGE)]
+[Obsolete(DeprecationMessages.FE1_DEPRECATION_MESSAGE)]
 public class CommitReceivedInput
 {
   public string streamId { get; set; }
@@ -120,7 +121,7 @@ public class CommitReceivedInput
 
 #endregion
 
-[Obsolete(DeprecationMessages.FE2_DEPRECATION_MESSAGE)]
+[Obsolete(DeprecationMessages.FE1_DEPRECATION_MESSAGE)]
 public class Stream
 {
   public string id { get; set; }
@@ -165,7 +166,7 @@ public override string ToString()
   }
 }
 
-[Obsolete(DeprecationMessages.FE2_DEPRECATION_MESSAGE)]
+[Obsolete(DeprecationMessages.FE1_DEPRECATION_MESSAGE)]
 public class Collaborator
 {
   public string id { get; set; }
@@ -179,13 +180,13 @@ public override string ToString()
   }
 }
 
-[Obsolete(DeprecationMessages.FE2_DEPRECATION_MESSAGE)]
+[Obsolete(DeprecationMessages.FE1_DEPRECATION_MESSAGE)]
 public class StreamInvitesResponse
 {
   public List<PendingStreamCollaborator> streamInvites { get; set; }
 }
 
-[Obsolete(DeprecationMessages.FE2_DEPRECATION_MESSAGE)]
+[Obsolete(DeprecationMessages.FE1_DEPRECATION_MESSAGE)]
 public class Branches
 {
   public int totalCount { get; set; }
@@ -193,7 +194,7 @@ public class Branches
   public List<Branch> items { get; set; }
 }
 
-[Obsolete(DeprecationMessages.FE2_DEPRECATION_MESSAGE)]
+[Obsolete(DeprecationMessages.FE1_DEPRECATION_MESSAGE)]
 public class Commits
 {
   public int totalCount { get; set; }
@@ -201,7 +202,7 @@ public class Commits
   public List<Commit> items { get; set; }
 }
 
-[Obsolete(DeprecationMessages.FE2_DEPRECATION_MESSAGE)]
+[Obsolete(DeprecationMessages.FE1_DEPRECATION_MESSAGE)]
 public class Commit
 {
   public string id { get; set; }
@@ -257,7 +258,7 @@ public class InfoCommit
   public string branchName { get; set; }
 }
 
-[Obsolete(DeprecationMessages.FE2_DEPRECATION_MESSAGE)]
+[Obsolete(DeprecationMessages.FE1_DEPRECATION_MESSAGE)]
 public class SpeckleObject
 {
   public string id { get; set; }
@@ -267,7 +268,7 @@ public class SpeckleObject
   public DateTime createdAt { get; set; }
 }
 
-[Obsolete(DeprecationMessages.FE2_DEPRECATION_MESSAGE)]
+[Obsolete(DeprecationMessages.FE1_DEPRECATION_MESSAGE)]
 public class Branch
 {
   public string id { get; set; }
@@ -281,7 +282,7 @@ public override string ToString()
   }
 }
 
-[Obsolete(DeprecationMessages.FE2_DEPRECATION_MESSAGE)]
+[Obsolete(DeprecationMessages.FE1_DEPRECATION_MESSAGE)]
 public class Streams
 {
   public int totalCount { get; set; }
@@ -289,14 +290,14 @@ public class Streams
   public List<Stream> items { get; set; }
 }
 
-[Obsolete(DeprecationMessages.FE2_DEPRECATION_MESSAGE)]
+[Obsolete(DeprecationMessages.FE1_DEPRECATION_MESSAGE)]
 public class Resource
 {
   public string resourceId { get; set; }
   public ResourceType resourceType { get; set; }
 }
 
-[Obsolete(DeprecationMessages.FE2_DEPRECATION_MESSAGE)]
+[Obsolete(DeprecationMessages.FE1_DEPRECATION_MESSAGE)]
 public class Location
 {
   public double x { get; set; }
@@ -304,33 +305,33 @@ public class Location
   public double z { get; set; }
 }
 
-[Obsolete(DeprecationMessages.FE2_DEPRECATION_MESSAGE)]
+[Obsolete(DeprecationMessages.FE1_DEPRECATION_MESSAGE)]
 public class UserSearchData
 {
   public UserSearch userSearch { get; set; }
 }
 
-[Obsolete(DeprecationMessages.FE2_DEPRECATION_MESSAGE)]
+[Obsolete(DeprecationMessages.FE1_DEPRECATION_MESSAGE)]
 public class UserSearch
 {
   public string cursor { get; set; }
   public List<LimitedUser> items { get; set; }
 }
 
-[Obsolete(DeprecationMessages.FE2_DEPRECATION_MESSAGE)]
+[Obsolete(DeprecationMessages.FE1_DEPRECATION_MESSAGE)]
 public class StreamData
 {
   public Stream stream { get; set; }
 }
 
-[Obsolete(DeprecationMessages.FE2_DEPRECATION_MESSAGE)]
+[Obsolete(DeprecationMessages.FE1_DEPRECATION_MESSAGE)]
 public class StreamsData
 {
   public Streams streams { get; set; }
 }
 
 #region comments
-[Obsolete(DeprecationMessages.FE2_DEPRECATION_MESSAGE)]
+[Obsolete(DeprecationMessages.FE1_DEPRECATION_MESSAGE)]
 public class Comments
 {
   public int totalCount { get; set; }
@@ -338,7 +339,7 @@ public class Comments
   public List<CommentItem> items { get; set; }
 }
 
-[Obsolete(DeprecationMessages.FE2_DEPRECATION_MESSAGE)]
+[Obsolete(DeprecationMessages.FE1_DEPRECATION_MESSAGE)]
 public sealed class CommentData
 {
   public Comments comments { get; init; }
@@ -349,7 +350,7 @@ public sealed class CommentData
   public object sectionBox { get; init; }
 }
 
-[Obsolete(DeprecationMessages.FE2_DEPRECATION_MESSAGE)]
+[Obsolete(DeprecationMessages.FE1_DEPRECATION_MESSAGE)]
 public class CommentItem
 {
   public string id { get; set; }
@@ -366,7 +367,7 @@ public class CommentItem
   public List<Resource> resources { get; set; }
 }
 
-[Obsolete(DeprecationMessages.FE2_DEPRECATION_MESSAGE)]
+[Obsolete(DeprecationMessages.FE1_DEPRECATION_MESSAGE)]
 public class ContentContent
 {
   public string Type { get; set; }
@@ -375,26 +376,26 @@ public class ContentContent
   public string Text { get; set; }
 }
 
-[Obsolete(DeprecationMessages.FE2_DEPRECATION_MESSAGE)]
+[Obsolete(DeprecationMessages.FE1_DEPRECATION_MESSAGE)]
 public class CommentsData
 {
   public Comments comments { get; set; }
 }
 
-[Obsolete(DeprecationMessages.FE2_DEPRECATION_MESSAGE)]
+[Obsolete(DeprecationMessages.FE1_DEPRECATION_MESSAGE)]
 public class CommentItemData
 {
   public CommentItem comment { get; set; }
 }
 
-[Obsolete(DeprecationMessages.FE2_DEPRECATION_MESSAGE)]
+[Obsolete(DeprecationMessages.FE1_DEPRECATION_MESSAGE)]
 public class CommentActivityMessage
 {
   public string type { get; set; }
   public CommentItem comment { get; set; }
 }
 
-[Obsolete(DeprecationMessages.FE2_DEPRECATION_MESSAGE)]
+[Obsolete(DeprecationMessages.FE1_DEPRECATION_MESSAGE)]
 public class CommentActivityResponse
 {
   public CommentActivityMessage commentActivity { get; set; }
diff --git a/src/Speckle.Core/Api/GraphQL/Legacy/SubscriptionModels.cs b/src/Speckle.Core/Api/GraphQL/Legacy/SubscriptionModels.cs
index f330899f..1594b44f 100644
--- a/src/Speckle.Core/Api/GraphQL/Legacy/SubscriptionModels.cs
+++ b/src/Speckle.Core/Api/GraphQL/Legacy/SubscriptionModels.cs
@@ -5,7 +5,7 @@
 namespace Speckle.Core.Api.SubscriptionModels;
 
 #region streams
-[Obsolete(DeprecationMessages.FE2_DEPRECATION_MESSAGE)]
+[Obsolete(DeprecationMessages.FE1_DEPRECATION_MESSAGE)]
 public class StreamInfo
 {
   public string id { get; set; }
@@ -14,19 +14,19 @@ public class StreamInfo
   public string sharedBy { get; set; }
 }
 
-[Obsolete(DeprecationMessages.FE2_DEPRECATION_MESSAGE)]
+[Obsolete(DeprecationMessages.FE1_DEPRECATION_MESSAGE)]
 public class UserStreamAddedResult
 {
   public StreamInfo userStreamAdded { get; set; }
 }
 
-[Obsolete(DeprecationMessages.FE2_DEPRECATION_MESSAGE)]
+[Obsolete(DeprecationMessages.FE1_DEPRECATION_MESSAGE)]
 public class StreamUpdatedResult
 {
   public StreamInfo streamUpdated { get; set; }
 }
 
-[Obsolete(DeprecationMessages.FE2_DEPRECATION_MESSAGE)]
+[Obsolete(DeprecationMessages.FE1_DEPRECATION_MESSAGE)]
 public class UserStreamRemovedResult
 {
   public StreamInfo userStreamRemoved { get; set; }
@@ -35,7 +35,7 @@ public class UserStreamRemovedResult
 
 #region branches
 
-[Obsolete(DeprecationMessages.FE2_DEPRECATION_MESSAGE)]
+[Obsolete(DeprecationMessages.FE1_DEPRECATION_MESSAGE)]
 public class BranchInfo
 {
   public string id { get; set; }
@@ -45,19 +45,19 @@ public class BranchInfo
   public string authorId { get; set; }
 }
 
-[Obsolete(DeprecationMessages.FE2_DEPRECATION_MESSAGE)]
+[Obsolete(DeprecationMessages.FE1_DEPRECATION_MESSAGE)]
 public class BranchCreatedResult
 {
   public BranchInfo branchCreated { get; set; }
 }
 
-[Obsolete(DeprecationMessages.FE2_DEPRECATION_MESSAGE)]
+[Obsolete(DeprecationMessages.FE1_DEPRECATION_MESSAGE)]
 public class BranchUpdatedResult
 {
   public BranchInfo branchUpdated { get; set; }
 }
 
-[Obsolete(DeprecationMessages.FE2_DEPRECATION_MESSAGE)]
+[Obsolete(DeprecationMessages.FE1_DEPRECATION_MESSAGE)]
 public class BranchDeletedResult
 {
   public BranchInfo branchDeleted { get; set; }
@@ -66,7 +66,7 @@ public class BranchDeletedResult
 
 #region commits
 
-[Obsolete(DeprecationMessages.FE2_DEPRECATION_MESSAGE)]
+[Obsolete(DeprecationMessages.FE1_DEPRECATION_MESSAGE)]
 public class CommitInfo
 {
   public string id { get; set; }
@@ -83,19 +83,19 @@ public class CommitInfo
   public IList<string> previousCommitIds { get; set; }
 }
 
-[Obsolete(DeprecationMessages.FE2_DEPRECATION_MESSAGE)]
+[Obsolete(DeprecationMessages.FE1_DEPRECATION_MESSAGE)]
 public class CommitCreatedResult
 {
   public CommitInfo commitCreated { get; set; }
 }
 
-[Obsolete(DeprecationMessages.FE2_DEPRECATION_MESSAGE)]
+[Obsolete(DeprecationMessages.FE1_DEPRECATION_MESSAGE)]
 public class CommitUpdatedResult
 {
   public CommitInfo commitUpdated { get; set; }
 }
 
-[Obsolete(DeprecationMessages.FE2_DEPRECATION_MESSAGE)]
+[Obsolete(DeprecationMessages.FE1_DEPRECATION_MESSAGE)]
 public class CommitDeletedResult
 {
   public CommitInfo commitDeleted { get; set; }
diff --git a/src/Speckle.Core/Api/GraphQL/Models/FileUpload.cs b/src/Speckle.Core/Api/GraphQL/Models/FileUpload.cs
index 8327e248..eb27a765 100644
--- a/src/Speckle.Core/Api/GraphQL/Models/FileUpload.cs
+++ b/src/Speckle.Core/Api/GraphQL/Models/FileUpload.cs
@@ -22,9 +22,9 @@ public sealed class FileUpload
   public DateTime uploadDate { get; init; }
   public string userId { get; init; }
 
-  [Obsolete(DeprecationMessages.FE2_DEPRECATION_MESSAGE)]
+  [Obsolete(DeprecationMessages.FE1_DEPRECATION_MESSAGE)]
   public string branchName { get; init; }
 
-  [Obsolete(DeprecationMessages.FE2_DEPRECATION_MESSAGE)]
+  [Obsolete(DeprecationMessages.FE1_DEPRECATION_MESSAGE)]
   public string streamId { get; init; }
 }
diff --git a/src/Speckle.Core/Api/GraphQL/Models/PendingStreamCollaborator.cs b/src/Speckle.Core/Api/GraphQL/Models/PendingStreamCollaborator.cs
index 805c0231..2fee6705 100644
--- a/src/Speckle.Core/Api/GraphQL/Models/PendingStreamCollaborator.cs
+++ b/src/Speckle.Core/Api/GraphQL/Models/PendingStreamCollaborator.cs
@@ -17,9 +17,9 @@ public sealed class PendingStreamCollaborator
   public LimitedUser user { get; init; }
   public string token { get; init; }
 
-  [Obsolete(DeprecationMessages.FE2_DEPRECATION_MESSAGE)]
+  [Obsolete(DeprecationMessages.FE1_DEPRECATION_MESSAGE)]
   public string streamId { get; init; }
 
-  [Obsolete(DeprecationMessages.FE2_DEPRECATION_MESSAGE)]
+  [Obsolete(DeprecationMessages.FE1_DEPRECATION_MESSAGE)]
   public string streamName { get; init; }
 }
diff --git a/src/Speckle.Core/Api/GraphQL/Models/Responses/MutationResponses.cs b/src/Speckle.Core/Api/GraphQL/Models/Responses/MutationResponses.cs
index b456d05e..55af5413 100644
--- a/src/Speckle.Core/Api/GraphQL/Models/Responses/MutationResponses.cs
+++ b/src/Speckle.Core/Api/GraphQL/Models/Responses/MutationResponses.cs
@@ -27,7 +27,9 @@ internal sealed class ModelMutation
 
 internal sealed class VersionMutation
 {
+  public Version create { get; init; }
   public bool delete { get; init; }
+  public bool markReceived { get; init; }
   public Model moveToModel { get; init; }
   public Version update { get; init; }
 }
diff --git a/src/Speckle.Core/Api/GraphQL/Models/User.cs b/src/Speckle.Core/Api/GraphQL/Models/User.cs
index f3d6b268..1588b433 100644
--- a/src/Speckle.Core/Api/GraphQL/Models/User.cs
+++ b/src/Speckle.Core/Api/GraphQL/Models/User.cs
@@ -13,15 +13,16 @@ public abstract class UserBase
   public string id { get; init; }
   public string name { get; init; }
   public string role { get; init; }
-
   public ResourceCollection<Activity> timeline { get; init; }
-  public int totalOwnedStreamsFavorites { get; init; }
   public bool? verified { get; init; }
 
-  [Obsolete(DeprecationMessages.FE2_DEPRECATION_MESSAGE)]
+  [Obsolete(DeprecationMessages.FE1_DEPRECATION_MESSAGE)]
+  public int totalOwnedStreamsFavorites { get; init; }
+
+  [Obsolete(DeprecationMessages.FE1_DEPRECATION_MESSAGE)]
   public ResourceCollection<Commit> commits { get; init; }
 
-  [Obsolete(DeprecationMessages.FE2_DEPRECATION_MESSAGE)]
+  [Obsolete(DeprecationMessages.FE1_DEPRECATION_MESSAGE)]
   public ResourceCollection<Stream> streams { get; init; }
 }
 
@@ -42,7 +43,7 @@ public sealed class User : UserBase
   public List<PendingStreamCollaborator> projectInvites { get; init; }
   public ResourceCollection<Project> projects { get; init; }
 
-  [Obsolete(DeprecationMessages.FE2_DEPRECATION_MESSAGE)]
+  [Obsolete(DeprecationMessages.FE1_DEPRECATION_MESSAGE)]
   public ResourceCollection<Stream> favoriteStreams { get; init; }
 
   public override string ToString()
diff --git a/src/Speckle.Core/Api/GraphQL/Resources/ActiveUserResource.cs b/src/Speckle.Core/Api/GraphQL/Resources/ActiveUserResource.cs
index 6da8610a..9946555d 100644
--- a/src/Speckle.Core/Api/GraphQL/Resources/ActiveUserResource.cs
+++ b/src/Speckle.Core/Api/GraphQL/Resources/ActiveUserResource.cs
@@ -132,8 +132,6 @@ query ProjectInvites {
             projectId
             projectName
             role
-            streamId
-            streamName
             title
             token
             user {
diff --git a/src/Speckle.Core/Api/GraphQL/Resources/ModelResource.cs b/src/Speckle.Core/Api/GraphQL/Resources/ModelResource.cs
index ee986422..e0898a49 100644
--- a/src/Speckle.Core/Api/GraphQL/Resources/ModelResource.cs
+++ b/src/Speckle.Core/Api/GraphQL/Resources/ModelResource.cs
@@ -43,7 +43,6 @@ query ModelGet($modelId: String!, $projectId: String!) {
               id
               name
               role
-              totalOwnedStreamsFavorites
               verified
             }
           }
@@ -95,7 +94,6 @@ query ModelGetWithVersions($modelId: String!, $projectId: String!, $versionsLimi
                 createdAt
                 previewUrl
                 authorUser {
-                  totalOwnedStreamsFavorites
                   id
                   name
                   bio
@@ -117,7 +115,6 @@ query ModelGetWithVersions($modelId: String!, $projectId: String!, $versionsLimi
               id
               name
               role
-              totalOwnedStreamsFavorites
               verified
             }
           }
@@ -224,7 +221,6 @@ mutation ModelCreate($input: CreateModelInput!) {
               id
               name
               role
-              totalOwnedStreamsFavorites
               verified
             }
           }
@@ -290,7 +286,6 @@ mutation ModelUpdate($input: UpdateModelInput!) {
               id
               name
               role
-              totalOwnedStreamsFavorites
               verified
             }
           }
diff --git a/src/Speckle.Core/Api/GraphQL/Resources/ProjectInviteResource.cs b/src/Speckle.Core/Api/GraphQL/Resources/ProjectInviteResource.cs
index 547c7569..44a120a5 100644
--- a/src/Speckle.Core/Api/GraphQL/Resources/ProjectInviteResource.cs
+++ b/src/Speckle.Core/Api/GraphQL/Resources/ProjectInviteResource.cs
@@ -44,7 +44,6 @@ mutation ProjectInviteCreate($projectId: ID!, $input: ProjectInviteCreateInput!)
               team {
                 role
                 user {
-                  totalOwnedStreamsFavorites
                   id
                   name
                   bio
@@ -59,13 +58,10 @@ mutation ProjectInviteCreate($projectId: ID!, $input: ProjectInviteCreateInput!)
                 inviteId
                 projectId
                 projectName
-                streamName
                 title
                 role
-                streamId
                 token
                 user {
-                  totalOwnedStreamsFavorites
                   id
                   name
                   bio
@@ -75,7 +71,6 @@ mutation ProjectInviteCreate($projectId: ID!, $input: ProjectInviteCreateInput!)
                   role
                 }
                 invitedBy {
-                  totalOwnedStreamsFavorites
                   id
                   name
                   bio
@@ -147,14 +142,11 @@ query ProjectInvite($projectId: String!, $token: String) {
             id
             name
             role
-            totalOwnedStreamsFavorites
             verified
           }
           projectId
           projectName
           role
-          streamId
-          streamName
           title
           token
           user {
@@ -164,7 +156,6 @@ query ProjectInvite($projectId: String!, $token: String) {
             id
             name
             role
-            totalOwnedStreamsFavorites
             verified
           }
         }
@@ -203,7 +194,6 @@ mutation ProjectInviteCancel($projectId: ID!, $inviteId: String!) {
               team {
                 role
                 user {
-                  totalOwnedStreamsFavorites
                   id
                   name
                   bio
@@ -218,13 +208,10 @@ mutation ProjectInviteCancel($projectId: ID!, $inviteId: String!) {
                 inviteId
                 projectId
                 projectName
-                streamName
                 title
                 role
-                streamId
                 token
                 user {
-                  totalOwnedStreamsFavorites
                   id
                   name
                   bio
@@ -234,7 +221,6 @@ mutation ProjectInviteCancel($projectId: ID!, $inviteId: String!) {
                   role
                 }
                 invitedBy {
-                  totalOwnedStreamsFavorites
                   id
                   name
                   bio
diff --git a/src/Speckle.Core/Api/GraphQL/Resources/ProjectResource.cs b/src/Speckle.Core/Api/GraphQL/Resources/ProjectResource.cs
index 34c505ec..641dbd18 100644
--- a/src/Speckle.Core/Api/GraphQL/Resources/ProjectResource.cs
+++ b/src/Speckle.Core/Api/GraphQL/Resources/ProjectResource.cs
@@ -136,7 +136,6 @@ query ProjectGetWithTeam($projectId: String!) {
           team {
             role
             user {
-              totalOwnedStreamsFavorites
               id
               name
               bio
@@ -151,13 +150,10 @@ query ProjectGetWithTeam($projectId: String!) {
             inviteId
             projectId
             projectName
-            streamId
-            streamName
             title
             role
             token
             user {
-              totalOwnedStreamsFavorites
               id
               name
               bio
@@ -167,7 +163,6 @@ query ProjectGetWithTeam($projectId: String!) {
               role
             }
             invitedBy {
-              totalOwnedStreamsFavorites
               id
               name
               bio
@@ -294,7 +289,6 @@ mutation ProjectUpdateRole($input: ProjectUpdateRoleInput!) {
             team {
               role
               user {
-                totalOwnedStreamsFavorites
                 id
                 name
                 bio
@@ -309,13 +303,10 @@ mutation ProjectUpdateRole($input: ProjectUpdateRoleInput!) {
               inviteId
               projectId
               projectName
-              streamId
-              streamName
               title
               role
               token
               user {
-                totalOwnedStreamsFavorites
                 id
                 name
                 bio
@@ -325,7 +316,6 @@ mutation ProjectUpdateRole($input: ProjectUpdateRoleInput!) {
                 role
               }
               invitedBy {
-                totalOwnedStreamsFavorites
                 id
                 name
                 bio
diff --git a/src/Speckle.Core/Api/GraphQL/Resources/SubscriptionResource.cs b/src/Speckle.Core/Api/GraphQL/Resources/SubscriptionResource.cs
index 37c8154b..ff8884ce 100644
--- a/src/Speckle.Core/Api/GraphQL/Resources/SubscriptionResource.cs
+++ b/src/Speckle.Core/Api/GraphQL/Resources/SubscriptionResource.cs
@@ -119,7 +119,6 @@ subscription ProjectModelsUpdated($id: String!, $modelIds: [String!]) {
               id
               name
               role
-              totalOwnedStreamsFavorites
               verified
             }
           }
@@ -186,7 +185,6 @@ subscription ProjectVersionsUpdated($id: String!) {
             createdAt
             previewUrl
             authorUser {
-              totalOwnedStreamsFavorites
               id
               name
               bio
diff --git a/src/Speckle.Core/Api/GraphQL/Resources/VersionResource.cs b/src/Speckle.Core/Api/GraphQL/Resources/VersionResource.cs
index 7aeb385d..a48fdcb8 100644
--- a/src/Speckle.Core/Api/GraphQL/Resources/VersionResource.cs
+++ b/src/Speckle.Core/Api/GraphQL/Resources/VersionResource.cs
@@ -43,7 +43,6 @@ query VersionGet($projectId: String!, $modelId: String!, $versionId: String!) {
               createdAt
               previewUrl
               authorUser {
-                totalOwnedStreamsFavorites
                 id
                 name
                 bio
@@ -105,7 +104,6 @@ query VersionGetVersions($projectId: String!, $modelId: String!, $limit: Int!, $
                 createdAt
                 previewUrl
                 authorUser {
-                  totalOwnedStreamsFavorites
                   id
                   name
                   bio
@@ -143,13 +141,29 @@ query VersionGetVersions($projectId: String!, $modelId: String!, $limit: Int!, $
     return response.project.model.versions;
   }
 
+  /// <param name="input"></param>
   /// <param name="cancellationToken"></param>
-  /// <returns></returns>
+  /// <returns>id of the created <see cref="Version"/></returns>
   /// <inheritdoc cref="ISpeckleGraphQLClient.ExecuteGraphQLRequest{T}"/>
-  public async Task<string> Create(CommitCreateInput input, CancellationToken cancellationToken = default)
+  public async Task<string> Create(CreateVersionInput input, CancellationToken cancellationToken = default)
   {
-    //TODO: Implement on server
-    return await ((Client)_client).CommitCreate(input, cancellationToken).ConfigureAwait(false);
+    //language=graphql
+    const string QUERY = """
+      mutation Create($input: CreateVersionInput!) {
+        versionMutations {
+          create(input: $input) {
+            id
+          }
+        }
+      }
+      """;
+
+    GraphQLRequest request = new() { Query = QUERY, Variables = new { input } };
+
+    var response = await _client
+      .ExecuteGraphQLRequest<VersionMutationResponse>(request, cancellationToken)
+      .ConfigureAwait(false);
+    return response.versionMutations.create.id;
   }
 
   /// <param name="input"></param>
@@ -169,7 +183,6 @@ mutation VersionUpdate($input: UpdateVersionInput!) {
             createdAt
             previewUrl
             authorUser {
-              totalOwnedStreamsFavorites
               id
               name
               bio
@@ -190,7 +203,6 @@ mutation VersionUpdate($input: UpdateVersionInput!) {
     return response.versionMutations.update;
   }
 
-  //TODO: Would we rather return the full model here? with or with out versions?
   /// <param name="input"></param>
   /// <param name="cancellationToken"></param>
   /// <returns></returns>
@@ -215,6 +227,7 @@ mutation VersionMoveToModel($input: MoveVersionsInput!) {
     return response.versionMutations.moveToModel.id;
   }
 
+  /// <param name="input"></param>
   /// <param name="cancellationToken"></param>
   /// <returns></returns>
   /// <inheritdoc cref="ISpeckleGraphQLClient.ExecuteGraphQLRequest{T}"/>
@@ -237,16 +250,26 @@ mutation VersionDelete($input: DeleteVersionsInput!) {
     return response.versionMutations.delete;
   }
 
-  /// <param name="commitReceivedInput"></param>
+  /// <param name="input"></param>
   /// <param name="cancellationToken"></param>
   /// <returns></returns>
   /// <inheritdoc cref="ISpeckleGraphQLClient.ExecuteGraphQLRequest{T}"/>
-  public async Task<bool> Received(
-    CommitReceivedInput commitReceivedInput,
-    CancellationToken cancellationToken = default
-  )
+  public async Task<bool> Received(MarkReceivedVersionInput input, CancellationToken cancellationToken = default)
   {
-    //TODO: Implement on server
-    return await ((Client)_client).CommitReceived(commitReceivedInput, cancellationToken).ConfigureAwait(false);
+    //language=graphql
+    const string QUERY = """
+      mutation MarkReceived($input: MarkReceivedVersionInput!) {
+        versionMutations {
+          markReceived(input: $input)
+        }
+      }
+      """;
+    GraphQLRequest request = new() { Query = QUERY, Variables = new { input } };
+
+    var response = await _client
+      .ExecuteGraphQLRequest<VersionMutationResponse>(request, cancellationToken)
+      .ConfigureAwait(false);
+
+    return response.versionMutations.markReceived;
   }
 }
diff --git a/src/Speckle.Core/Credentials/Responses.cs b/src/Speckle.Core/Credentials/Responses.cs
index 066dfde6..7f701935 100644
--- a/src/Speckle.Core/Credentials/Responses.cs
+++ b/src/Speckle.Core/Credentials/Responses.cs
@@ -27,16 +27,16 @@ public sealed class UserInfo
   public string? company { get; init; }
   public string? avatar { get; init; }
 
-  [Obsolete(DeprecationMessages.FE2_DEPRECATION_MESSAGE)]
+  [Obsolete(DeprecationMessages.FE1_DEPRECATION_MESSAGE)]
   public Streams streams { get; init; }
 
-  [Obsolete(DeprecationMessages.FE2_DEPRECATION_MESSAGE)]
+  [Obsolete(DeprecationMessages.FE1_DEPRECATION_MESSAGE)]
   public Commits commits { get; init; }
 }
 
 [ClassInterface(ClassInterfaceType.AutoDual)]
 [ComVisible(true)]
-[Obsolete(DeprecationMessages.FE2_DEPRECATION_MESSAGE)]
+[Obsolete(DeprecationMessages.FE1_DEPRECATION_MESSAGE)]
 public class Streams
 {
   public int totalCount { get; set; }
@@ -44,7 +44,7 @@ public class Streams
 
 [ClassInterface(ClassInterfaceType.AutoDual)]
 [ComVisible(true)]
-[Obsolete(DeprecationMessages.FE2_DEPRECATION_MESSAGE)]
+[Obsolete(DeprecationMessages.FE1_DEPRECATION_MESSAGE)]
 public class Commits
 {
   public int totalCount { get; set; }
diff --git a/tests/Speckle.Core.Tests.Integration/Api/GraphQL/Resources/CommentResourceTests.cs b/tests/Speckle.Core.Tests.Integration/Api/GraphQL/Resources/CommentResourceTests.cs
index cdf25948..2149bd8b 100644
--- a/tests/Speckle.Core.Tests.Integration/Api/GraphQL/Resources/CommentResourceTests.cs
+++ b/tests/Speckle.Core.Tests.Integration/Api/GraphQL/Resources/CommentResourceTests.cs
@@ -21,7 +21,7 @@ public async Task Setup()
     _testUser = await Fixtures.SeedUserWithClient();
     _project = await _testUser.Project.Create(new("Test project", "", null));
     _model = await _testUser.Model.Create(new("Test Model 1", "", _project.id));
-    _versionId = await Fixtures.CreateVersion(_testUser, _project.id, _model.name);
+    _versionId = await Fixtures.CreateVersion(_testUser, _project.id, _model.id);
     _comment = await CreateComment();
   }
 
diff --git a/tests/Speckle.Core.Tests.Integration/Api/GraphQL/Resources/SubscriptionResourceTests.cs b/tests/Speckle.Core.Tests.Integration/Api/GraphQL/Resources/SubscriptionResourceTests.cs
index 7bf52ed1..d5ee196b 100644
--- a/tests/Speckle.Core.Tests.Integration/Api/GraphQL/Resources/SubscriptionResourceTests.cs
+++ b/tests/Speckle.Core.Tests.Integration/Api/GraphQL/Resources/SubscriptionResourceTests.cs
@@ -22,7 +22,7 @@ public async Task Setup()
     _testUser = await Fixtures.SeedUserWithClient();
     _testProject = await _testUser.Project.Create(new("test project123", "desc", null));
     _testModel = await _testUser.Model.Create(new("test model", "desc", _testProject.id));
-    _testVersion = await Fixtures.CreateVersion(_testUser, _testProject.id, _testModel.name);
+    _testVersion = await Fixtures.CreateVersion(_testUser, _testProject.id, _testModel.id);
   }
 
   [Test]
@@ -91,7 +91,7 @@ public async Task ProjectVersionsUpdated_SubscriptionIsCalled()
 
     await Task.Delay(WAIT_PERIOD); // Give time to subscription to be setup
 
-    var created = await Fixtures.CreateVersion(_testUser, _testProject.id, _testModel.name);
+    var created = await Fixtures.CreateVersion(_testUser, _testProject.id, _testModel.id);
 
     await Task.Delay(WAIT_PERIOD); // Give time for subscription to be triggered
 
diff --git a/tests/Speckle.Core.Tests.Integration/Api/GraphQL/Resources/VersionResourceTests.cs b/tests/Speckle.Core.Tests.Integration/Api/GraphQL/Resources/VersionResourceTests.cs
index d54c966e..3afb0a0a 100644
--- a/tests/Speckle.Core.Tests.Integration/Api/GraphQL/Resources/VersionResourceTests.cs
+++ b/tests/Speckle.Core.Tests.Integration/Api/GraphQL/Resources/VersionResourceTests.cs
@@ -24,7 +24,7 @@ public async Task Setup()
     _model1 = await _testUser.Model.Create(new("Test Model 1", "", _project.id));
     _model2 = await _testUser.Model.Create(new("Test Model 2", "", _project.id));
 
-    string versionId = await Fixtures.CreateVersion(_testUser, _project.id, "Test Model 1");
+    string versionId = await Fixtures.CreateVersion(_testUser, _project.id, _model1.id);
 
     _version = await Sut.Get(versionId, _model1.id, _project.id);
   }
@@ -51,14 +51,7 @@ public async Task VersionsGet()
   [Test]
   public async Task VersionReceived()
   {
-    CommitReceivedInput input =
-      new()
-      {
-        commitId = _version.id,
-        message = "we receieved it",
-        sourceApplication = "Integration test",
-        streamId = _project.id
-      };
+    MarkReceivedVersionInput input = new(_version.id, _project.id, "Integration test");
     var result = await Sut.Received(input);
 
     Assert.That(result, Is.True);
diff --git a/tests/Speckle.Core.Tests.Integration/Fixtures.cs b/tests/Speckle.Core.Tests.Integration/Fixtures.cs
index f44fc6c2..50d7d9e7 100644
--- a/tests/Speckle.Core.Tests.Integration/Fixtures.cs
+++ b/tests/Speckle.Core.Tests.Integration/Fixtures.cs
@@ -41,18 +41,11 @@ public static async Task<Client> SeedUserWithClient()
     return new Client(await SeedUser());
   }
 
-  public static async Task<string> CreateVersion(Client client, string projectId, string branchName)
+  public static async Task<string> CreateVersion(Client client, string projectId, string modelId)
   {
     using ServerTransport remote = new(client.Account, projectId);
     var objectId = await Operations.Send(new() { applicationId = "ASDF" }, remote, false);
-    CommitCreateInput input =
-      new()
-      {
-        branchName = branchName,
-        message = "test version",
-        objectId = objectId,
-        streamId = projectId
-      };
+    CreateVersionInput input = new(objectId, modelId, projectId);
     return await client.Version.Create(input);
   }