diff --git a/src/Sql/Sql.sqlproj b/src/Sql/Sql.sqlproj
index e5b29b0085..8df155dd93 100644
--- a/src/Sql/Sql.sqlproj
+++ b/src/Sql/Sql.sqlproj
@@ -69,127 +69,106 @@
     <Folder Include="dbo\User Defined Types\" />
   </ItemGroup>
   <ItemGroup>
-    <Build Include="dbo\Stored Procedures\EmergencyAccessDetails_ReadByIdGrantorId.sql" />
-    <Build Include="dbo\Stored Procedures\Event_ReadPageByProviderId.sql" />
-    <Build Include="dbo\Stored Procedures\Event_ReadPageByProviderIdActingUserId.sql" />
-    <Build Include="dbo\Stored Procedures\ProviderOrganization_ReadByOrganizationId.sql" />
-    <Build Include="dbo\Stored Procedures\ProviderUserProviderOrganizationDetails_ReadByUserIdStatus.sql" />
-    <Build Include="dbo\Stored Procedures\ProviderUser_ReadCountByOnlyOwner.sql" />
-    <Build Include="dbo\Stored Procedures\SsoConfig_Create.sql" />
-    <Build Include="dbo\Stored Procedures\SsoConfig_ReadByIdentifier.sql" />
-    <Build Include="dbo\Stored Procedures\SsoConfig_ReadByOrganizationId.sql" />
-    <Build Include="dbo\Stored Procedures\SsoConfig_Update.sql" />
-    <Build Include="dbo\Stored Procedures\User_ReadPublicKeysByProviderUserIds.sql" />
-    <Build Include="dbo\Tables\Grant.sql" />
-    <Build Include="dbo\Tables\SsoConfig.sql" />
-    <Build Include="dbo\Tables\User.sql" />
-    <Build Include="dbo\Tables\Device.sql" />
-    <Build Include="dbo\Tables\Folder.sql" />
-    <Build Include="dbo\Tables\Cipher.sql" />
-    <Build Include="dbo\Tables\Collection.sql" />
-    <Build Include="dbo\Tables\Group.sql" />
-    <Build Include="dbo\Tables\CollectionCipher.sql" />
-    <Build Include="dbo\Tables\GroupUser.sql" />
-    <Build Include="dbo\Tables\CollectionGroup.sql" />
-    <Build Include="dbo\Tables\CollectionUser.sql" />
-    <Build Include="dbo\Tables\OrganizationUser.sql" />
-    <Build Include="dbo\Tables\Organization.sql" />
-    <Build Include="dbo\Tables\OrganizationSponsorship.sql" />
-    <Build Include="dbo\Views\GrantView.sql" />
-    <Build Include="dbo\Views\ProviderOrganizationOrganizationDetailsView.sql" />
-    <Build Include="dbo\Views\ProviderUserProviderDetailsView.sql" />
-    <Build Include="dbo\Views\ProviderUserProviderOrganizationDetailsView.sql" />
-    <Build Include="dbo\Views\SsoConfigView.sql" />
-    <Build Include="dbo\Views\SsoUserView.sql" />
-    <Build Include="dbo\Views\UserView.sql" />
-    <Build Include="dbo\Views\CipherView.sql" />
-    <Build Include="dbo\Views\DeviceView.sql" />
-    <Build Include="dbo\Views\GroupView.sql" />
-    <Build Include="dbo\Views\CollectionView.sql" />
-    <Build Include="dbo\Views\FolderView.sql" />
-    <Build Include="dbo\Views\OrganizationUserOrganizationDetailsView.sql" />
-    <Build Include="dbo\Views\OrganizationUserUserDetailsView.sql" />
-    <Build Include="dbo\Views\OrganizationUserView.sql" />
-    <Build Include="dbo\Views\OrganizationView.sql" />
-    <Build Include="dbo\Functions\UserCipherDetails.sql" />
     <Build Include="dbo\Functions\CipherDetails.sql" />
-    <Build Include="dbo\Stored Procedures\Organization_ReadById.sql" />
-    <Build Include="dbo\Stored Procedures\Organization_ReadByUserId.sql" />
-    <Build Include="dbo\Stored Procedures\Organization_ReadByProviderId.sql" />
-    <Build Include="dbo\Stored Procedures\Organization_Update.sql" />
-    <Build Include="dbo\Stored Procedures\OrganizationUser_Create.sql" />
-    <Build Include="dbo\Stored Procedures\OrganizationUser_CreateMany.sql" />
-    <Build Include="dbo\Stored Procedures\Grant_DeleteByKey.sql" />
-    <Build Include="dbo\Stored Procedures\OrganizationUser_DeleteById.sql" />
-    <Build Include="dbo\Stored Procedures\OrganizationUser_DeleteByIds.sql" />
-    <Build Include="dbo\Stored Procedures\OrganizationUser_Deactivate.sql" />
-    <Build Include="dbo\Stored Procedures\OrganizationUser_Activate.sql" />
-    <Build Include="dbo\Stored Procedures\Grant_Delete.sql" />
-    <Build Include="dbo\Stored Procedures\OrganizationUser_ReadById.sql" />
-    <Build Include="dbo\Stored Procedures\OrganizationUser_ReadByIds.sql" />
-    <Build Include="dbo\Stored Procedures\OrganizationUser_ReadByOrganizationId.sql" />
-    <Build Include="dbo\Stored Procedures\Grant_ReadByKey.sql" />
-    <Build Include="dbo\Stored Procedures\Grant_Read.sql" />
-    <Build Include="dbo\Stored Procedures\OrganizationUser_ReadByOrganizationIdUserId.sql" />
-    <Build Include="dbo\Stored Procedures\Grant_Save.sql" />
-    <Build Include="dbo\Stored Procedures\OrganizationUser_ReadByUserId.sql" />
-    <Build Include="dbo\Stored Procedures\OrganizationUser_ReadCountByFreeOrganizationAdminUser.sql" />
-    <Build Include="dbo\Stored Procedures\User_ReadAccountRevisionDateById.sql" />
-    <Build Include="dbo\Stored Procedures\OrganizationUser_ReadByMinimumRole.sql" />
-    <Build Include="dbo\Stored Procedures\OrganizationUser_ReadCountByOrganizationId.sql" />
-    <Build Include="dbo\Stored Procedures\OrganizationUser_ReadCountByOnlyOwner.sql" />
-    <Build Include="dbo\Stored Procedures\OrganizationUser_SelectKnownEmails.sql" />
-    <Build Include="dbo\Stored Procedures\OrganizationUser_Update.sql" />
-    <Build Include="dbo\Stored Procedures\OrganizationUser_UpdateMany.sql" />
-    <Build Include="dbo\Stored Procedures\OrganizationUserOrganizationDetails_ReadByUserIdStatus.sql" />
-    <Build Include="dbo\Stored Procedures\OrganizationUserUserDetails_ReadByOrganizationId.sql" />
-    <Build Include="dbo\Stored Procedures\User_BumpAccountRevisionDate.sql" />
-    <Build Include="dbo\Stored Procedures\User_BumpManyAccountRevisionDates.sql" />
-    <Build Include="dbo\Stored Procedures\User_BumpAccountRevisionDateByOrganizationId.sql" />
-    <Build Include="dbo\Stored Procedures\User_BumpAccountRevisionDateByOrganizationUserId.sql" />
-    <Build Include="dbo\Stored Procedures\User_BumpAccountRevisionDateByOrganizationUserIds.sql" />
-    <Build Include="dbo\Stored Procedures\User_BumpAccountRevisionDateByProviderUserIds.sql" />
-    <Build Include="dbo\Stored Procedures\Cipher_Delete.sql" />
-    <Build Include="dbo\Stored Procedures\User_ReadPublicKeyById.sql" />
-    <Build Include="dbo\Stored Procedures\User_ReadPublicKeysByOrganizationUserIds.sql" />
-    <Build Include="dbo\Stored Procedures\Cipher_Move.sql" />
-    <Build Include="dbo\Stored Procedures\Cipher_UpdatePartial.sql" />
-    <Build Include="dbo\Stored Procedures\Device_ClearPushTokenById.sql" />
-    <Build Include="dbo\Stored Procedures\Cipher_UpdateWithCollections.sql" />
-    <Build Include="dbo\Stored Procedures\Device_ReadByIdentifier.sql" />
+    <Build Include="dbo\Functions\PolicyApplicableToUser.sql" />
+    <Build Include="dbo\Functions\UserCipherDetails.sql" />
+    <Build Include="dbo\Functions\UserCollectionDetails.sql" />
+    <Build Include="dbo\Stored Procedures\AzureSQLMaintenance.sql" />
     <Build Include="dbo\Stored Procedures\CipherDetails_Create.sql" />
-    <Build Include="dbo\Stored Procedures\User_UpdateKeys.sql" />
+    <Build Include="dbo\Stored Procedures\CipherDetails_CreateWithCollections.sql" />
+    <Build Include="dbo\Stored Procedures\CipherDetails_ReadByIdUserId.sql" />
+    <Build Include="dbo\Stored Procedures\CipherDetails_ReadByUserId.sql" />
+    <Build Include="dbo\Stored Procedures\CipherDetails_ReadWithoutOrganizationsByUserId.sql" />
     <Build Include="dbo\Stored Procedures\CipherDetails_Update.sql" />
+    <Build Include="dbo\Stored Procedures\CipherOrganizationDetails_ReadById.sql" />
+    <Build Include="dbo\Stored Procedures\CipherOrganizationDetails_ReadByOrganizationId.sql" />
+    <Build Include="dbo\Stored Procedures\Cipher_Create.sql" />
+    <Build Include="dbo\Stored Procedures\Cipher_CreateWithCollections.sql" />
+    <Build Include="dbo\Stored Procedures\Cipher_Delete.sql" />
+    <Build Include="dbo\Stored Procedures\Cipher_DeleteAttachment.sql" />
+    <Build Include="dbo\Stored Procedures\Cipher_DeleteById.sql" />
+    <Build Include="dbo\Stored Procedures\Cipher_DeleteByIdsOrganizationId.sql" />
+    <Build Include="dbo\Stored Procedures\Cipher_DeleteByOrganizationId.sql" />
+    <Build Include="dbo\Stored Procedures\Cipher_DeleteByUserId.sql" />
+    <Build Include="dbo\Stored Procedures\Cipher_DeleteDeleted.sql" />
+    <Build Include="dbo\Stored Procedures\Cipher_Move.sql" />
+    <Build Include="dbo\Stored Procedures\Cipher_ReadById.sql" />
+    <Build Include="dbo\Stored Procedures\Cipher_ReadByOrganizationId.sql" />
+    <Build Include="dbo\Stored Procedures\Cipher_ReadCanEditByIdUserId.sql" />
+    <Build Include="dbo\Stored Procedures\Cipher_Restore.sql" />
+    <Build Include="dbo\Stored Procedures\Cipher_SoftDelete.sql" />
+    <Build Include="dbo\Stored Procedures\Cipher_SoftDeleteByIdsOrganizationId.sql" />
+    <Build Include="dbo\Stored Procedures\Cipher_Update.sql" />
+    <Build Include="dbo\Stored Procedures\Cipher_UpdateAttachment.sql" />
+    <Build Include="dbo\Stored Procedures\Cipher_UpdateCollections.sql" />
+    <Build Include="dbo\Stored Procedures\Cipher_UpdatePartial.sql" />
+    <Build Include="dbo\Stored Procedures\Cipher_UpdateWithCollections.sql" />
     <Build Include="dbo\Stored Procedures\CollectionCipher_Create.sql" />
     <Build Include="dbo\Stored Procedures\CollectionCipher_Delete.sql" />
+    <Build Include="dbo\Stored Procedures\CollectionCipher_ReadByOrganizationId.sql" />
+    <Build Include="dbo\Stored Procedures\CollectionCipher_ReadByUserId.sql" />
+    <Build Include="dbo\Stored Procedures\CollectionCipher_ReadByUserIdCipherId.sql" />
     <Build Include="dbo\Stored Procedures\CollectionCipher_UpdateCollections.sql" />
     <Build Include="dbo\Stored Procedures\CollectionCipher_UpdateCollectionsAdmin.sql" />
-    <Build Include="dbo\Stored Procedures\Folder_Create.sql" />
-    <Build Include="dbo\Stored Procedures\Folder_DeleteById.sql" />
-    <Build Include="dbo\Stored Procedures\Folder_Update.sql" />
-    <Build Include="dbo\Stored Procedures\Organization_DeleteById.sql" />
-    <Build Include="dbo\Stored Procedures\Cipher_ReadCanEditByIdUserId.sql" />
-    <Build Include="dbo\Stored Procedures\Cipher_Create.sql" />
-    <Build Include="dbo\Stored Procedures\Cipher_DeleteById.sql" />
-    <Build Include="dbo\Stored Procedures\Cipher_DeleteDeleted.sql" />
-    <Build Include="dbo\Stored Procedures\Cipher_ReadById.sql" />
-    <Build Include="dbo\Stored Procedures\Cipher_Update.sql" />
+    <Build Include="dbo\Stored Procedures\CollectionCipher_UpdateCollectionsForCiphers.sql" />
+    <Build Include="dbo\Stored Procedures\CollectionUser_Delete.sql" />
+    <Build Include="dbo\Stored Procedures\CollectionUser_ReadByCollectionId.sql" />
+    <Build Include="dbo\Stored Procedures\CollectionUser_UpdateUsers.sql" />
+    <Build Include="dbo\Stored Procedures\Collection_Create.sql" />
+    <Build Include="dbo\Stored Procedures\Collection_CreateWithGroups.sql" />
+    <Build Include="dbo\Stored Procedures\Collection_DeleteById.sql" />
+    <Build Include="dbo\Stored Procedures\Collection_ReadById.sql" />
+    <Build Include="dbo\Stored Procedures\Collection_ReadByIdUserId.sql" />
+    <Build Include="dbo\Stored Procedures\Collection_ReadByOrganizationId.sql" />
+    <Build Include="dbo\Stored Procedures\Collection_ReadByUserId.sql" />
+    <Build Include="dbo\Stored Procedures\Collection_ReadCountByOrganizationId.sql" />
+    <Build Include="dbo\Stored Procedures\Collection_ReadWithGroupsById.sql" />
+    <Build Include="dbo\Stored Procedures\Collection_ReadWithGroupsByIdUserId.sql" />
+    <Build Include="dbo\Stored Procedures\Collection_Update.sql" />
+    <Build Include="dbo\Stored Procedures\Collection_UpdateWithGroups.sql" />
+    <Build Include="dbo\Stored Procedures\Device_ClearPushTokenById.sql" />
     <Build Include="dbo\Stored Procedures\Device_Create.sql" />
     <Build Include="dbo\Stored Procedures\Device_DeleteById.sql" />
     <Build Include="dbo\Stored Procedures\Device_ReadById.sql" />
+    <Build Include="dbo\Stored Procedures\Device_ReadByIdentifier.sql" />
     <Build Include="dbo\Stored Procedures\Device_ReadByIdentifierUserId.sql" />
     <Build Include="dbo\Stored Procedures\Device_ReadByUserId.sql" />
     <Build Include="dbo\Stored Procedures\Device_Update.sql" />
-    <Build Include="dbo\Stored Procedures\User_Create.sql" />
-    <Build Include="dbo\Stored Procedures\User_DeleteById.sql" />
-    <Build Include="dbo\Stored Procedures\Collection_ReadWithGroupsById.sql" />
-    <Build Include="dbo\Stored Procedures\User_ReadByEmail.sql" />
-    <Build Include="dbo\Stored Procedures\Collection_UpdateWithGroups.sql" />
-    <Build Include="dbo\Stored Procedures\User_ReadById.sql" />
-    <Build Include="dbo\Stored Procedures\User_ReadByIds.sql" />
-    <Build Include="dbo\Stored Procedures\CollectionUser_Delete.sql" />
-    <Build Include="dbo\Stored Procedures\User_Update.sql" />
-    <Build Include="dbo\Stored Procedures\CollectionUser_ReadByCollectionId.sql" />
+    <Build Include="dbo\Stored Procedures\EmergencyAccessDetails_ReadByGranteeId.sql" />
+    <Build Include="dbo\Stored Procedures\EmergencyAccessDetails_ReadByGrantorId.sql" />
+    <Build Include="dbo\Stored Procedures\EmergencyAccessDetails_ReadByIdGrantorId.sql" />
+    <Build Include="dbo\Stored Procedures\EmergencyAccessDetails_ReadExpiredRecoveries.sql" />
+    <Build Include="dbo\Stored Procedures\EmergencyAccess_Create.sql" />
+    <Build Include="dbo\Stored Procedures\EmergencyAccess_DeleteById.sql" />
+    <Build Include="dbo\Stored Procedures\EmergencyAccess_ReadById.sql" />
+    <Build Include="dbo\Stored Procedures\EmergencyAccess_ReadCountByGrantorIdEmail.sql" />
+    <Build Include="dbo\Stored Procedures\EmergencyAccess_ReadToNotify.sql" />
+    <Build Include="dbo\Stored Procedures\EmergencyAccess_Update.sql" />
+    <Build Include="dbo\Stored Procedures\Event_Create.sql" />
+    <Build Include="dbo\Stored Procedures\Event_ReadById.sql" />
+    <Build Include="dbo\Stored Procedures\Event_ReadPageByCipherId.sql" />
+    <Build Include="dbo\Stored Procedures\Event_ReadPageByOrganizationId.sql" />
+    <Build Include="dbo\Stored Procedures\Event_ReadPageByOrganizationIdActingUserId.sql" />
+    <Build Include="dbo\Stored Procedures\Event_ReadPageByProviderId.sql" />
+    <Build Include="dbo\Stored Procedures\Event_ReadPageByProviderIdActingUserId.sql" />
+    <Build Include="dbo\Stored Procedures\Event_ReadPageByUserId.sql" />
+    <Build Include="dbo\Stored Procedures\Folder_Create.sql" />
+    <Build Include="dbo\Stored Procedures\Folder_DeleteById.sql" />
+    <Build Include="dbo\Stored Procedures\Folder_ReadById.sql" />
+    <Build Include="dbo\Stored Procedures\Folder_ReadByUserId.sql" />
+    <Build Include="dbo\Stored Procedures\Folder_Update.sql" />
+    <Build Include="dbo\Stored Procedures\Grant_Delete.sql" />
+    <Build Include="dbo\Stored Procedures\Grant_DeleteByKey.sql" />
+    <Build Include="dbo\Stored Procedures\Grant_DeleteExpired.sql" />
+    <Build Include="dbo\Stored Procedures\Grant_Read.sql" />
+    <Build Include="dbo\Stored Procedures\Grant_ReadByKey.sql" />
+    <Build Include="dbo\Stored Procedures\Grant_Save.sql" />
+    <Build Include="dbo\Stored Procedures\GroupUser_Delete.sql" />
+    <Build Include="dbo\Stored Procedures\GroupUser_ReadByOrganizationId.sql" />
+    <Build Include="dbo\Stored Procedures\GroupUser_ReadGroupIdsByOrganizationUserId.sql" />
+    <Build Include="dbo\Stored Procedures\GroupUser_ReadOrganizationUserIdsByGroupId.sql" />
+    <Build Include="dbo\Stored Procedures\GroupUser_UpdateGroups.sql" />
+    <Build Include="dbo\Stored Procedures\GroupUser_UpdateUsers.sql" />
     <Build Include="dbo\Stored Procedures\Group_Create.sql" />
     <Build Include="dbo\Stored Procedures\Group_CreateWithCollections.sql" />
     <Build Include="dbo\Stored Procedures\Group_DeleteById.sql" />
@@ -198,32 +177,26 @@
     <Build Include="dbo\Stored Procedures\Group_ReadWithCollectionsById.sql" />
     <Build Include="dbo\Stored Procedures\Group_Update.sql" />
     <Build Include="dbo\Stored Procedures\Group_UpdateWithCollections.sql" />
-    <Build Include="dbo\Stored Procedures\GroupUser_Delete.sql" />
-    <Build Include="dbo\Stored Procedures\GroupUser_ReadByOrganizationId.sql" />
-    <Build Include="dbo\Stored Procedures\GroupUser_ReadGroupIdsByOrganizationUserId.sql" />
-    <Build Include="dbo\Stored Procedures\GroupUser_UpdateGroups.sql" />
-    <Build Include="dbo\Stored Procedures\GroupUser_UpdateUsers.sql" />
-    <Build Include="dbo\Stored Procedures\OrganizationUser_CreateWithCollections.sql" />
-    <Build Include="dbo\Stored Procedures\OrganizationUser_ReadWithCollectionsById.sql" />
-    <Build Include="dbo\Stored Procedures\OrganizationUser_UpdateWithCollections.sql" />
-    <Build Include="dbo\Stored Procedures\Cipher_ReadByOrganizationId.sql" />
-    <Build Include="dbo\Stored Procedures\CipherDetails_ReadByIdUserId.sql" />
-    <Build Include="dbo\Stored Procedures\CipherDetails_ReadByUserId.sql" />
-    <Build Include="dbo\Stored Procedures\Collection_Create.sql" />
-    <Build Include="dbo\Stored Procedures\Collection_DeleteById.sql" />
-    <Build Include="dbo\Stored Procedures\Collection_ReadById.sql" />
-    <Build Include="dbo\Stored Procedures\Collection_ReadByOrganizationId.sql" />
-    <Build Include="dbo\Stored Procedures\Collection_ReadByUserId.sql" />
-    <Build Include="dbo\Stored Procedures\Collection_ReadCountByOrganizationId.sql" />
-    <Build Include="dbo\Stored Procedures\Collection_Update.sql" />
-    <Build Include="dbo\Stored Procedures\CollectionCipher_ReadByOrganizationId.sql" />
-    <Build Include="dbo\Stored Procedures\CollectionCipher_ReadByUserId.sql" />
-    <Build Include="dbo\Stored Procedures\CollectionCipher_ReadByUserIdCipherId.sql" />
-    <Build Include="dbo\Stored Procedures\Folder_ReadById.sql" />
-    <Build Include="dbo\Stored Procedures\Folder_ReadByUserId.sql" />
-    <Build Include="dbo\Stored Procedures\Organization_Create.sql" />
+    <Build Include="dbo\Stored Procedures\Installation_Create.sql" />
+    <Build Include="dbo\Stored Procedures\Installation_DeleteById.sql" />
+    <Build Include="dbo\Stored Procedures\Installation_ReadById.sql" />
+    <Build Include="dbo\Stored Procedures\Installation_Update.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationApiKey_Create.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationApiKey_DeleteById.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationApiKey_OrganizationDeleted.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationApiKey_ReadManyByOrganizationIdType.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationApiKey_Update.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationConnection_Create.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationConnection_DeleteById.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationConnection_OrganizationDeleted.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationConnection_ReadById.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationConnection_ReadByOrganizationIdType.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationConnection_Update.sql" />
     <Build Include="dbo\Stored Procedures\OrganizationSponsorship_Create.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationSponsorship_CreateMany.sql" />
     <Build Include="dbo\Stored Procedures\OrganizationSponsorship_DeleteById.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationSponsorship_DeleteByIds.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationSponsorship_DeleteExpired.sql" />
     <Build Include="dbo\Stored Procedures\OrganizationSponsorship_OrganizationDeleted.sql" />
     <Build Include="dbo\Stored Procedures\OrganizationSponsorship_OrganizationUserDeleted.sql" />
     <Build Include="dbo\Stored Procedures\OrganizationSponsorship_OrganizationUsersDeleted.sql" />
@@ -231,167 +204,208 @@
     <Build Include="dbo\Stored Procedures\OrganizationSponsorship_ReadByOfferedToEmail.sql" />
     <Build Include="dbo\Stored Procedures\OrganizationSponsorship_ReadBySponsoredOrganizationId.sql" />
     <Build Include="dbo\Stored Procedures\OrganizationSponsorship_ReadBySponsoringOrganiationUserId.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationSponsorship_ReadBySponsoringOrganizationId.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationSponsorship_ReadLatestBySponsoringOrganizationId.sql" />
     <Build Include="dbo\Stored Procedures\OrganizationSponsorship_Update.sql" />
-    <Build Include="dbo\User Defined Types\EmailArray.sql" />
-    <Build Include="dbo\User Defined Types\GuidIdArray.sql" />
-    <Build Include="dbo\User Defined Types\OrganizationUserType.sql" />
-    <Build Include="dbo\User Defined Types\TwoGuidIdArray.sql" />
-    <Build Include="dbo\User Defined Types\SelectionReadOnlyArray.sql" />
-    <Build Include="dbo\Stored Procedures\Cipher_UpdateAttachment.sql" />
-    <Build Include="dbo\Stored Procedures\Organization_UpdateStorage.sql" />
-    <Build Include="dbo\Stored Procedures\User_UpdateStorage.sql" />
-    <Build Include="dbo\Stored Procedures\Cipher_DeleteAttachment.sql" />
-    <Build Include="dbo\Tables\Installation.sql" />
-    <Build Include="dbo\Stored Procedures\Installation_Create.sql" />
-    <Build Include="dbo\Stored Procedures\Installation_DeleteById.sql" />
-    <Build Include="dbo\Stored Procedures\Installation_ReadById.sql" />
-    <Build Include="dbo\Stored Procedures\Installation_Update.sql" />
-    <Build Include="dbo\Views\InstallationView.sql" />
-    <Build Include="dbo\Stored Procedures\Organization_ReadByEnabled.sql" />
-    <Build Include="dbo\Stored Procedures\User_ReadByPremium.sql" />
-    <Build Include="dbo\Stored Procedures\CipherOrganizationDetails_ReadById.sql" />
-    <Build Include="dbo\Stored Procedures\Cipher_DeleteByUserId.sql" />
-    <Build Include="dbo\Stored Procedures\User_BumpAccountRevisionDateByCollectionId.sql" />
-    <Build Include="dbo\Stored Procedures\User_BumpAccountRevisionDateByCipherId.sql" />
-    <Build Include="dbo\Tables\Event.sql" />
-    <Build Include="dbo\Stored Procedures\Event_Create.sql" />
-    <Build Include="dbo\Views\EventView.sql" />
-    <Build Include="dbo\Stored Procedures\Event_ReadPageByUserId.sql" />
-    <Build Include="dbo\Stored Procedures\Event_ReadPageByOrganizationId.sql" />
-    <Build Include="dbo\Stored Procedures\Event_ReadPageByCipherId.sql" />
-    <Build Include="dbo\Stored Procedures\Event_ReadPageByOrganizationIdActingUserId.sql" />
-    <Build Include="dbo\Stored Procedures\Organization_ReadAbilities.sql" />
-    <Build Include="dbo\Stored Procedures\User_Search.sql" />
-    <Build Include="dbo\Stored Procedures\Organization_Search.sql" />
-    <Build Include="dbo\Stored Procedures\OrganizationUser_ReadCountByOrganizationIdEmail.sql" />
-    <Build Include="dbo\Stored Procedures\CipherDetails_ReadWithoutOrganizationsByUserId.sql" />
-    <Build Include="dbo\Stored Procedures\CollectionCipher_UpdateCollectionsForCiphers.sql" />
-    <Build Include="dbo\Stored Procedures\User_UpdateRenewalReminderDate.sql" />
-    <Build Include="dbo\Stored Procedures\Grant_DeleteExpired.sql" />
-    <Build Include="dbo\Stored Procedures\User_ReadKdfByEmail.sql" />
-    <Build Include="dbo\Stored Procedures\Cipher_DeleteByOrganizationId.sql" />
-    <Build Include="dbo\Stored Procedures\AzureSQLMaintenance.sql" />
-    <Build Include="dbo\Functions\UserCollectionDetails.sql" />
-    <Build Include="dbo\Stored Procedures\Collection_ReadByIdUserId.sql" />
-    <Build Include="dbo\Stored Procedures\Collection_ReadWithGroupsByIdUserId.sql" />
-    <Build Include="dbo\Stored Procedures\Collection_CreateWithGroups.sql" />
-    <Build Include="dbo\Stored Procedures\CollectionUser_UpdateUsers.sql" />
-    <Build Include="dbo\Stored Procedures\GroupUser_ReadOrganizationUserIdsByGroupId.sql" />
-    <Build Include="dbo\Stored Procedures\Cipher_CreateWithCollections.sql" />
-    <Build Include="dbo\Stored Procedures\Cipher_UpdateCollections.sql" />
-    <Build Include="dbo\Stored Procedures\CipherDetails_CreateWithCollections.sql" />
-    <Build Include="dbo\Tables\Transaction.sql" />
-    <Build Include="dbo\Stored Procedures\Transaction_Create.sql" />
-    <Build Include="dbo\Stored Procedures\Transaction_DeleteById.sql" />
-    <Build Include="dbo\Stored Procedures\Transaction_ReadById.sql" />
-    <Build Include="dbo\Stored Procedures\Transaction_ReadByOrganizationId.sql" />
-    <Build Include="dbo\Stored Procedures\Transaction_Update.sql" />
-    <Build Include="dbo\Views\TransactionView.sql" />
-    <Build Include="dbo\Stored Procedures\Transaction_ReadByUserId.sql" />
-    <Build Include="dbo\Stored Procedures\Transaction_ReadByGatewayId.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationSponsorship_UpdateMany.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationUserOrganizationDetails_ReadByUserIdStatus.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationUserOrganizationDetails_ReadByUserIdStatusOrganizationId.sql" />
     <Build Include="dbo\Stored Procedures\OrganizationUserUserDetails_ReadById.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationUserUserDetails_ReadByOrganizationId.sql" />
     <Build Include="dbo\Stored Procedures\OrganizationUserUserDetails_ReadWithCollectionsById.sql" />
-    <Build Include="dbo\Tables\Policy.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationUser_Activate.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationUser_Create.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationUser_CreateMany.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationUser_CreateWithCollections.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationUser_Deactivate.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationUser_DeleteById.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationUser_DeleteByIds.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationUser_ReadById.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationUser_ReadByIds.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationUser_ReadByMinimumRole.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationUser_ReadByOrganizationId.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationUser_ReadByOrganizationIdEmail.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationUser_ReadByOrganizationIdUserId.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationUser_ReadByUserId.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationUser_ReadByUserIds.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationUser_ReadCountByFreeOrganizationAdminUser.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationUser_ReadCountByOnlyOwner.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationUser_ReadCountByOrganizationId.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationUser_ReadCountByOrganizationIdEmail.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationUser_ReadWithCollectionsById.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationUser_SelectKnownEmails.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationUser_Update.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationUser_UpdateMany.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationUser_UpdateWithCollections.sql" />
+    <Build Include="dbo\Stored Procedures\Organization_Create.sql" />
+    <Build Include="dbo\Stored Procedures\Organization_DeleteById.sql" />
+    <Build Include="dbo\Stored Procedures\Organization_ReadAbilities.sql" />
+    <Build Include="dbo\Stored Procedures\Organization_ReadByEnabled.sql" />
+    <Build Include="dbo\Stored Procedures\Organization_ReadById.sql" />
+    <Build Include="dbo\Stored Procedures\Organization_ReadByIdentifier.sql" />
+    <Build Include="dbo\Stored Procedures\Organization_ReadByProviderId.sql" />
+    <Build Include="dbo\Stored Procedures\Organization_ReadByUserId.sql" />
+    <Build Include="dbo\Stored Procedures\Organization_Search.sql" />
+    <Build Include="dbo\Stored Procedures\Organization_Update.sql" />
+    <Build Include="dbo\Stored Procedures\Organization_UpdateStorage.sql" />
+    <Build Include="dbo\Stored Procedures\Policy_CountByTypeApplicableToUser.sql" />
     <Build Include="dbo\Stored Procedures\Policy_Create.sql" />
     <Build Include="dbo\Stored Procedures\Policy_DeleteById.sql" />
     <Build Include="dbo\Stored Procedures\Policy_ReadById.sql" />
     <Build Include="dbo\Stored Procedures\Policy_ReadByOrganizationId.sql" />
-    <Build Include="dbo\Stored Procedures\Policy_Update.sql" />
-    <Build Include="dbo\Views\PolicyView.sql" />
     <Build Include="dbo\Stored Procedures\Policy_ReadByOrganizationIdType.sql" />
+    <Build Include="dbo\Stored Procedures\Policy_ReadByTypeApplicableToUser.sql" />
     <Build Include="dbo\Stored Procedures\Policy_ReadByUserId.sql" />
-    <Build Include="dbo\Stored Procedures\Cipher_Restore.sql" />
-    <Build Include="dbo\Stored Procedures\Cipher_SoftDelete.sql" />
-    <Build Include="dbo\Tables\SsoUser.sql" />
-    <Build Include="dbo\Stored Procedures\SsoUser_Delete.sql" />
-    <Build Include="dbo\Stored Procedures\SsoUser_DeleteMany.sql" />
-    <Build Include="dbo\Stored Procedures\SsoUser_Create.sql" />
-    <Build Include="dbo\Stored Procedures\User_ReadBySsoUserOrganizationIdExternalId.sql" />
-    <Build Include="dbo\Stored Procedures\SsoUser_Update.sql" />
-    <Build Include="dbo\Stored Procedures\SsoUser_ReadById.sql" />
-    <Build Include="dbo\Stored Procedures\SsoUser_ReadByUserIdOrganizationId.sql" />
-    <Build Include="dbo\Stored Procedures\Cipher_DeleteByIdsOrganizationId.sql" />
-    <Build Include="dbo\Stored Procedures\Cipher_SoftDeleteByIdsOrganizationId.sql" />
-    <Build Include="dbo\Stored Procedures\Organization_ReadByIdentifier.sql" />
-    <Build Include="dbo\Stored Procedures\Send_Create.sql" />
-    <Build Include="dbo\Stored Procedures\Send_DeleteById.sql" />
-    <Build Include="dbo\Stored Procedures\Send_ReadById.sql" />
-    <Build Include="dbo\Stored Procedures\Send_ReadByUserId.sql" />
-    <Build Include="dbo\Stored Procedures\Send_Update.sql" />
-    <Build Include="dbo\Stored Procedures\SsoConfig_ReadManyByNotBeforeRevisionDate.sql" />
-    <Build Include="dbo\Tables\Send.sql" />
-    <Build Include="dbo\Views\SendView.sql" />
-    <Build Include="dbo\Stored Procedures\OrganizationUser_ReadByUserIds.sql" />
-    <Build Include="dbo\Stored Procedures\Send_ReadByDeletionDateBefore.sql" />
-    <Build Include="dbo\Tables\EmergencyAccess.sql" />
-    <Build Include="dbo\Stored Procedures\EmergencyAccess_Create.sql" />
-    <Build Include="dbo\Stored Procedures\EmergencyAccess_ReadById.sql" />
-    <Build Include="dbo\Stored Procedures\EmergencyAccess_ReadCountByGrantorIdEmail.sql" />
-    <Build Include="dbo\Stored Procedures\EmergencyAccess_Update.sql" />
-    <Build Include="dbo\Views\EmergencyAccessDetailsView.sql" />
-    <Build Include="dbo\Stored Procedures\EmergencyAccessDetails_ReadByGrantorId.sql" />
-    <Build Include="dbo\Stored Procedures\EmergencyAccess_DeleteById.sql" />
-    <Build Include="dbo\Stored Procedures\User_BumpAccountRevisionDateByEmergencyAccessGranteeId.sql" />
-    <Build Include="dbo\Stored Procedures\EmergencyAccessDetails_ReadByGranteeId.sql" />
-    <Build Include="dbo\Stored Procedures\EmergencyAccess_ReadToNotify.sql" />
-    <Build Include="dbo\Stored Procedures\EmergencyAccessDetails_ReadExpiredRecoveries.sql" />
-    <Build Include="dbo\Tables\TaxRate.sql" />
-    <Build Include="dbo\Stored Procedures\TaxRate_Search.sql" />
-    <Build Include="dbo\Stored Procedures\TaxRate_ReadByLocation.sql" />
-    <Build Include="dbo\Stored Procedures\TaxRate_ReadById.sql" />
-    <Build Include="dbo\Stored Procedures\TaxRate_ReadAllActive.sql" />
-    <Build Include="dbo\Stored Procedures\TaxRate_Create.sql" />
-    <Build Include="dbo\Stored Procedures\TaxRate_Archive.sql" />
-    <Build Include="dbo\Stored Procedures\OrganizationUser_ReadByOrganizationIdEmail.sql" />
-    <Build Include="dbo\Stored Procedures\OrganizationUserOrganizationDetails_ReadByUserIdStatusOrganizationId.sql" />
-    <Build Include="dbo\Tables\Provider.sql" />
-    <Build Include="dbo\Views\ProviderView.sql" />
-    <Build Include="dbo\Stored Procedures\Provider_Create.sql" />
-    <Build Include="dbo\Stored Procedures\Provider_Update.sql" />
-    <Build Include="dbo\Stored Procedures\Provider_DeleteById.sql" />
-    <Build Include="dbo\Stored Procedures\Provider_ReadById.sql" />
-    <Build Include="dbo\Stored Procedures\Provider_Search.sql" />
-    <Build Include="dbo\Stored Procedures\Provider_ReadAbilities.sql" />
-    <Build Include="dbo\Tables\ProviderUser.sql" />
-    <Build Include="dbo\Views\ProviderUserView.sql" />
+    <Build Include="dbo\Stored Procedures\Policy_Update.sql" />
+    <Build Include="dbo\Stored Procedures\ProviderOrganizationOrganizationDetails_ReadByProviderId.sql" />
+    <Build Include="dbo\Stored Procedures\ProviderOrganization_Create.sql" />
+    <Build Include="dbo\Stored Procedures\ProviderOrganization_DeleteById.sql" />
+    <Build Include="dbo\Stored Procedures\ProviderOrganization_ReadById.sql" />
+    <Build Include="dbo\Stored Procedures\ProviderOrganization_ReadByOrganizationId.sql" />
+    <Build Include="dbo\Stored Procedures\ProviderOrganization_Update.sql" />
+    <Build Include="dbo\Stored Procedures\ProviderUserProviderDetails_ReadByUserIdStatus.sql" />
+    <Build Include="dbo\Stored Procedures\ProviderUserProviderOrganizationDetails_ReadByUserIdStatus.sql" />
+    <Build Include="dbo\Stored Procedures\ProviderUserUserDetails_ReadByProviderId.sql" />
     <Build Include="dbo\Stored Procedures\ProviderUser_Create.sql" />
-    <Build Include="dbo\Stored Procedures\ProviderUser_Update.sql" />
     <Build Include="dbo\Stored Procedures\ProviderUser_DeleteById.sql" />
     <Build Include="dbo\Stored Procedures\ProviderUser_DeleteByIds.sql" />
     <Build Include="dbo\Stored Procedures\ProviderUser_ReadById.sql" />
     <Build Include="dbo\Stored Procedures\ProviderUser_ReadByIds.sql" />
     <Build Include="dbo\Stored Procedures\ProviderUser_ReadByProviderId.sql" />
-    <Build Include="dbo\Stored Procedures\ProviderUser_ReadByUserId.sql" />
-    <Build Include="dbo\Stored Procedures\ProviderUser_ReadCountByProviderIdEmail.sql" />
     <Build Include="dbo\Stored Procedures\ProviderUser_ReadByProviderIdUserId.sql" />
-    <Build Include="dbo\Stored Procedures\ProviderUserProviderDetails_ReadByUserIdStatus.sql" />
-    <Build Include="dbo\Views\ProviderUserUserDetailsView.sql" />
-    <Build Include="dbo\Stored Procedures\ProviderUserUserDetails_ReadByProviderId.sql" />
-    <Build Include="dbo\Tables\ProviderOrganization.sql" />
-    <Build Include="dbo\Views\ProviderOrganizationView.sql" />
-    <Build Include="dbo\Stored Procedures\ProviderOrganization_Create.sql" />
-    <Build Include="dbo\Stored Procedures\ProviderOrganization_Update.sql" />
-    <Build Include="dbo\Stored Procedures\ProviderOrganization_DeleteById.sql" />
-    <Build Include="dbo\Stored Procedures\ProviderOrganization_ReadById.sql" />
-    <Build Include="dbo\Stored Procedures\ProviderOrganizationOrganizationDetails_ReadByProviderId.sql" />
+    <Build Include="dbo\Stored Procedures\ProviderUser_ReadByUserId.sql" />
+    <Build Include="dbo\Stored Procedures\ProviderUser_ReadCountByOnlyOwner.sql" />
+    <Build Include="dbo\Stored Procedures\ProviderUser_ReadCountByProviderIdEmail.sql" />
+    <Build Include="dbo\Stored Procedures\ProviderUser_Update.sql" />
+    <Build Include="dbo\Stored Procedures\Provider_Create.sql" />
+    <Build Include="dbo\Stored Procedures\Provider_DeleteById.sql" />
+    <Build Include="dbo\Stored Procedures\Provider_ReadAbilities.sql" />
+    <Build Include="dbo\Stored Procedures\Provider_ReadById.sql" />
+    <Build Include="dbo\Stored Procedures\Provider_Search.sql" />
+    <Build Include="dbo\Stored Procedures\Provider_Update.sql" />
+    <Build Include="dbo\Stored Procedures\Send_Create.sql" />
+    <Build Include="dbo\Stored Procedures\Send_DeleteById.sql" />
+    <Build Include="dbo\Stored Procedures\Send_ReadByDeletionDateBefore.sql" />
+    <Build Include="dbo\Stored Procedures\Send_ReadById.sql" />
+    <Build Include="dbo\Stored Procedures\Send_ReadByUserId.sql" />
+    <Build Include="dbo\Stored Procedures\Send_Update.sql" />
+    <Build Include="dbo\Stored Procedures\SsoConfig_Create.sql" />
+    <Build Include="dbo\Stored Procedures\SsoConfig_DeleteById.sql" />
+    <Build Include="dbo\Stored Procedures\SsoConfig_ReadById.sql" />
+    <Build Include="dbo\Stored Procedures\SsoConfig_ReadByIdentifier.sql" />
+    <Build Include="dbo\Stored Procedures\SsoConfig_ReadByOrganizationId.sql" />
+    <Build Include="dbo\Stored Procedures\SsoConfig_ReadManyByNotBeforeRevisionDate.sql" />
+    <Build Include="dbo\Stored Procedures\SsoConfig_Update.sql" />
+    <Build Include="dbo\Stored Procedures\SsoUser_Create.sql" />
+    <Build Include="dbo\Stored Procedures\SsoUser_Delete.sql" />
+    <Build Include="dbo\Stored Procedures\SsoUser_DeleteById.sql" />
+    <Build Include="dbo\Stored Procedures\SsoUser_DeleteMany.sql" />
+    <Build Include="dbo\Stored Procedures\SsoUser_ReadById.sql" />
+    <Build Include="dbo\Stored Procedures\SsoUser_ReadByUserIdOrganizationId.sql" />
+    <Build Include="dbo\Stored Procedures\SsoUser_Update.sql" />
+    <Build Include="dbo\Stored Procedures\TaxRate_Archive.sql" />
+    <Build Include="dbo\Stored Procedures\TaxRate_Create.sql" />
+    <Build Include="dbo\Stored Procedures\TaxRate_ReadAllActive.sql" />
+    <Build Include="dbo\Stored Procedures\TaxRate_ReadById.sql" />
+    <Build Include="dbo\Stored Procedures\TaxRate_ReadByLocation.sql" />
+    <Build Include="dbo\Stored Procedures\TaxRate_Search.sql" />
+    <Build Include="dbo\Stored Procedures\Transaction_Create.sql" />
+    <Build Include="dbo\Stored Procedures\Transaction_DeleteById.sql" />
+    <Build Include="dbo\Stored Procedures\Transaction_ReadByGatewayId.sql" />
+    <Build Include="dbo\Stored Procedures\Transaction_ReadById.sql" />
+    <Build Include="dbo\Stored Procedures\Transaction_ReadByOrganizationId.sql" />
+    <Build Include="dbo\Stored Procedures\Transaction_ReadByUserId.sql" />
+    <Build Include="dbo\Stored Procedures\Transaction_Update.sql" />
+    <Build Include="dbo\Stored Procedures\User_BumpAccountRevisionDate.sql" />
+    <Build Include="dbo\Stored Procedures\User_BumpAccountRevisionDateByCipherId.sql" />
+    <Build Include="dbo\Stored Procedures\User_BumpAccountRevisionDateByCollectionId.sql" />
+    <Build Include="dbo\Stored Procedures\User_BumpAccountRevisionDateByEmergencyAccessGranteeId.sql" />
+    <Build Include="dbo\Stored Procedures\User_BumpAccountRevisionDateByOrganizationId.sql" />
+    <Build Include="dbo\Stored Procedures\User_BumpAccountRevisionDateByOrganizationUserId.sql" />
+    <Build Include="dbo\Stored Procedures\User_BumpAccountRevisionDateByOrganizationUserIds.sql" />
     <Build Include="dbo\Stored Procedures\User_BumpAccountRevisionDateByProviderId.sql" />
     <Build Include="dbo\Stored Procedures\User_BumpAccountRevisionDateByProviderUserId.sql" />
-    <Build Include="dbo\Stored Procedures\Policy_CountByTypeApplicableToUser.sql" />
-    <Build Include="dbo\Stored Procedures\Policy_ReadByTypeApplicableToUser.sql" />
-    <Build Include="dbo\Functions\PolicyApplicableToUser.sql" />
-    <Build Include="dbo\Stored Procedures\OrganizationApiKey_Create.sql" />
-    <Build Include="dbo\Stored Procedures\OrganizationApiKey_OrganizationDeleted.sql" />
-    <Build Include="dbo\Stored Procedures\OrganizationApiKey_ReadManyByOrganizationIdType.sql" />
-    <Build Include="dbo\Stored Procedures\OrganizationApiKey_Update.sql" />
+    <Build Include="dbo\Stored Procedures\User_BumpAccountRevisionDateByProviderUserIds.sql" />
+    <Build Include="dbo\Stored Procedures\User_BumpManyAccountRevisionDates.sql" />
+    <Build Include="dbo\Stored Procedures\User_Create.sql" />
+    <Build Include="dbo\Stored Procedures\User_DeleteById.sql" />
+    <Build Include="dbo\Stored Procedures\User_ReadAccountRevisionDateById.sql" />
+    <Build Include="dbo\Stored Procedures\User_ReadByEmail.sql" />
+    <Build Include="dbo\Stored Procedures\User_ReadById.sql" />
+    <Build Include="dbo\Stored Procedures\User_ReadByIds.sql" />
+    <Build Include="dbo\Stored Procedures\User_ReadByPremium.sql" />
+    <Build Include="dbo\Stored Procedures\User_ReadBySsoUserOrganizationIdExternalId.sql" />
+    <Build Include="dbo\Stored Procedures\User_ReadKdfByEmail.sql" />
+    <Build Include="dbo\Stored Procedures\User_ReadPublicKeyById.sql" />
+    <Build Include="dbo\Stored Procedures\User_ReadPublicKeysByOrganizationUserIds.sql" />
+    <Build Include="dbo\Stored Procedures\User_ReadPublicKeysByProviderUserIds.sql" />
+    <Build Include="dbo\Stored Procedures\User_Search.sql" />
+    <Build Include="dbo\Stored Procedures\User_Update.sql" />
+    <Build Include="dbo\Stored Procedures\User_UpdateKeys.sql" />
+    <Build Include="dbo\Stored Procedures\User_UpdateRenewalReminderDate.sql" />
+    <Build Include="dbo\Stored Procedures\User_UpdateStorage.sql" />
+    <Build Include="dbo\Tables\Cipher.sql" />
+    <Build Include="dbo\Tables\Collection.sql" />
+    <Build Include="dbo\Tables\CollectionCipher.sql" />
+    <Build Include="dbo\Tables\CollectionGroup.sql" />
+    <Build Include="dbo\Tables\CollectionUser.sql" />
+    <Build Include="dbo\Tables\Device.sql" />
+    <Build Include="dbo\Tables\EmergencyAccess.sql" />
+    <Build Include="dbo\Tables\Event.sql" />
+    <Build Include="dbo\Tables\Folder.sql" />
+    <Build Include="dbo\Tables\Grant.sql" />
+    <Build Include="dbo\Tables\Group.sql" />
+    <Build Include="dbo\Tables\GroupUser.sql" />
+    <Build Include="dbo\Tables\Installation.sql" />
+    <Build Include="dbo\Tables\Organization.sql" />
     <Build Include="dbo\Tables\OrganizationApiKey.sql" />
     <Build Include="dbo\Tables\OrganizationConnection.sql" />
-    <Build Include="dbo\Stored Procedures\OrganizationConnection_Create.sql" />
-    <Build Include="dbo\Stored Procedures\OrganizationConnection_Update.sql" />
-    <Build Include="dbo\Stored Procedures\OrganizationConnection_DeleteById.sql" />
-    <Build Include="dbo\Stored Procedures\OrganizationConnection_ReadById.sql" />
-    <Build Include="dbo\Stored Procedures\OrganizationConnection_ReadByOrganizationIdType.sql" />
+    <Build Include="dbo\Tables\OrganizationSponsorship.sql" />
+    <Build Include="dbo\Tables\OrganizationUser.sql" />
+    <Build Include="dbo\Tables\Policy.sql" />
+    <Build Include="dbo\Tables\Provider.sql" />
+    <Build Include="dbo\Tables\ProviderOrganization.sql" />
+    <Build Include="dbo\Tables\ProviderUser.sql" />
+    <Build Include="dbo\Tables\Send.sql" />
+    <Build Include="dbo\Tables\SsoConfig.sql" />
+    <Build Include="dbo\Tables\SsoUser.sql" />
+    <Build Include="dbo\Tables\TaxRate.sql" />
+    <Build Include="dbo\Tables\Transaction.sql" />
+    <Build Include="dbo\Tables\User.sql" />
+    <Build Include="dbo\User Defined Types\EmailArray.sql" />
+    <Build Include="dbo\User Defined Types\GuidIdArray.sql" />
+    <Build Include="dbo\User Defined Types\OrganizationSponsorshipType.sql" />
+    <Build Include="dbo\User Defined Types\OrganizationUserType.sql" />
+    <Build Include="dbo\User Defined Types\SelectionReadOnlyArray.sql" />
+    <Build Include="dbo\User Defined Types\TwoGuidIdArray.sql" />
+    <Build Include="dbo\Views\CipherView.sql" />
+    <Build Include="dbo\Views\CollectionView.sql" />
+    <Build Include="dbo\Views\DeviceView.sql" />
+    <Build Include="dbo\Views\EmergencyAccessDetailsView.sql" />
+    <Build Include="dbo\Views\EventView.sql" />
+    <Build Include="dbo\Views\FolderView.sql" />
+    <Build Include="dbo\Views\GrantView.sql" />
+    <Build Include="dbo\Views\GroupView.sql" />
+    <Build Include="dbo\Views\InstallationView.sql" />
     <Build Include="dbo\Views\OrganizationApiKeyView.sql" />
     <Build Include="dbo\Views\OrganizationConnectionView.sql" />
-    <Build Include="dbo\Stored Procedures\CipherOrganizationDetails_ReadByOrganizationId.sql" />
+    <Build Include="dbo\Views\OrganizationSponsorship.sql" />
+    <Build Include="dbo\Views\OrganizationUserOrganizationDetailsView.sql" />
+    <Build Include="dbo\Views\OrganizationUserUserDetailsView.sql" />
+    <Build Include="dbo\Views\OrganizationUserView.sql" />
+    <Build Include="dbo\Views\OrganizationView.sql" />
+    <Build Include="dbo\Views\PolicyView.sql" />
+    <Build Include="dbo\Views\ProviderOrganizationOrganizationDetailsView.sql" />
+    <Build Include="dbo\Views\ProviderOrganizationView.sql" />
+    <Build Include="dbo\Views\ProviderUserProviderDetailsView.sql" />
+    <Build Include="dbo\Views\ProviderUserProviderOrganizationDetailsView.sql" />
+    <Build Include="dbo\Views\ProviderUserUserDetailsView.sql" />
+    <Build Include="dbo\Views\ProviderUserView.sql" />
+    <Build Include="dbo\Views\ProviderView.sql" />
+    <Build Include="dbo\Views\SendView.sql" />
+    <Build Include="dbo\Views\SsoConfigView.sql" />
+    <Build Include="dbo\Views\SsoUserView.sql" />
+    <Build Include="dbo\Views\TransactionView.sql" />
+    <Build Include="dbo\Views\UserView.sql" />
   </ItemGroup>
 </Project>
diff --git a/src/Sql/dbo/Stored Procedures/Event_Create.sql b/src/Sql/dbo/Stored Procedures/Event_Create.sql
index 9b55c7fb6f..665d6a12c9 100644
--- a/src/Sql/dbo/Stored Procedures/Event_Create.sql	
+++ b/src/Sql/dbo/Stored Procedures/Event_Create.sql	
@@ -3,6 +3,7 @@
     @Type INT,
     @UserId UNIQUEIDENTIFIER,
     @OrganizationId UNIQUEIDENTIFIER,
+    @InstallationId UNIQUEIDENTIFIER,
     @ProviderId UNIQUEIDENTIFIER,
     @CipherId UNIQUEIDENTIFIER,
     @CollectionId UNIQUEIDENTIFIER,
@@ -25,6 +26,7 @@ BEGIN
         [Type],
         [UserId],
         [OrganizationId],
+        [InstallationId],
         [ProviderId],
         [CipherId],
         [CollectionId],
@@ -44,6 +46,7 @@ BEGIN
         @Type,
         @UserId,
         @OrganizationId,
+        @InstallationId,
         @ProviderId,
         @CipherId,
         @CollectionId,
diff --git a/src/Sql/dbo/Stored Procedures/Event_ReadById.sql b/src/Sql/dbo/Stored Procedures/Event_ReadById.sql
new file mode 100644
index 0000000000..e14790b934
--- /dev/null
+++ b/src/Sql/dbo/Stored Procedures/Event_ReadById.sql	
@@ -0,0 +1,13 @@
+CREATE PROCEDURE [dbo].[Event_ReadById]
+    @Id UNIQUEIDENTIFIER
+AS
+BEGIN
+    SET NOCOUNT ON
+
+    SELECT
+        *
+    FROM
+        [dbo].[Event]
+    WHERE
+        [Id] = @Id
+END
diff --git a/src/Sql/dbo/Stored Procedures/OrganizationSponsorship_ReadLatestBySponsoringOrganizationId.sql b/src/Sql/dbo/Stored Procedures/OrganizationSponsorship_ReadLatestBySponsoringOrganizationId.sql
new file mode 100644
index 0000000000..90449ce835
--- /dev/null
+++ b/src/Sql/dbo/Stored Procedures/OrganizationSponsorship_ReadLatestBySponsoringOrganizationId.sql	
@@ -0,0 +1,13 @@
+CREATE PROCEDURE [dbo].[OrganizationSponsorship_ReadLatestBySponsoringOrganizationId]
+    @SponsoringOrganizationId UNIQUEIDENTIFIER
+AS
+BEGIN
+    SELECT TOP 1
+        [LastSyncDate]
+    FROM
+        [dbo].[OrganizationSponsorshipView]
+    WHERE
+        [SponsoringOrganizationId] = @SponsoringOrganizationId AND
+        [LastSyncDate] IS NOT NULL
+    ORDER BY [LastSyncDate] DESC
+END
diff --git a/src/Sql/dbo/Stored Procedures/SsoConfig_ReadById.sql b/src/Sql/dbo/Stored Procedures/SsoConfig_ReadById.sql
index fbca19bf15..077632d0a0 100644
--- a/src/Sql/dbo/Stored Procedures/SsoConfig_ReadById.sql	
+++ b/src/Sql/dbo/Stored Procedures/SsoConfig_ReadById.sql	
@@ -1,4 +1,4 @@
-CREATE PROCEDURE [dbo].[SsoUser_ReadById]
+CREATE PROCEDURE [dbo].[SsoConfig_ReadById]
     @Id BIGINT
 AS
 BEGIN
@@ -7,7 +7,7 @@ BEGIN
     SELECT
         *
     FROM
-        [dbo].[SsoUserView]
+        [dbo].[SsoConfigView]
     WHERE
         [Id] = @Id
-END
\ No newline at end of file
+END
diff --git a/src/Sql/dbo/Stored Procedures/User_BumpAccountRevisionDateByOrganizationUserIds.sql b/src/Sql/dbo/Stored Procedures/User_BumpAccountRevisionDateByOrganizationUserIds.sql
index 9daa82fcc7..ea43263484 100644
--- a/src/Sql/dbo/Stored Procedures/User_BumpAccountRevisionDateByOrganizationUserIds.sql	
+++ b/src/Sql/dbo/Stored Procedures/User_BumpAccountRevisionDateByOrganizationUserIds.sql	
@@ -4,15 +4,24 @@ AS
 BEGIN
     SET NOCOUNT ON
 
+    SELECT
+        OU.UserId
+    INTO
+        #UserIds
+    FROM
+        [dbo].[OrganizationUser] OU
+    INNER JOIN
+        @OrganizationUserIds OUIds ON OUIds.Id = OU.Id
+    WHERE
+        OU.[Status] = 2 -- Confirmed
+
     UPDATE
         U
     SET
         U.[AccountRevisionDate] = GETUTCDATE()
     FROM
-        @OrganizationUserIds OUIDs
+        [dbo].[User] U
     INNER JOIN
-        [dbo].[OrganizationUser] OU ON OUIDs.Id = OU.Id AND OU.[Status] = 2 -- Confirmed
-    INNER JOIN
-        [dbo].[User] U ON OU.UserId = U.Id
+        #UserIds ON U.[Id] = #UserIds.[UserId]
 END
 GO
diff --git a/src/Sql/dbo/Tables/OrganizationSponsorship.sql b/src/Sql/dbo/Tables/OrganizationSponsorship.sql
index 79c92edcee..7377162b5c 100644
--- a/src/Sql/dbo/Tables/OrganizationSponsorship.sql
+++ b/src/Sql/dbo/Tables/OrganizationSponsorship.sql
@@ -6,7 +6,7 @@ CREATE TABLE [dbo].[OrganizationSponsorship] (
     [FriendlyName]                  NVARCHAR(256)    NULL,
     [OfferedToEmail]                NVARCHAR (256)   NULL,
     [PlanSponsorshipType]           TINYINT          NULL,
-    [ToDelete]                      BIT              NULL,
+    [ToDelete]                      BIT              DEFAULT (0) NOT NULL,
     [LastSyncDate]                  DATETIME2 (7)    NULL,
     [ValidUntil]                    DATETIME2 (7)    NULL,
     CONSTRAINT [PK_OrganizationSponsorship] PRIMARY KEY CLUSTERED ([Id] ASC),
diff --git a/src/Sql/dbo/Tables/User.sql b/src/Sql/dbo/Tables/User.sql
index 13f7048115..ddc0b8ab35 100644
--- a/src/Sql/dbo/Tables/User.sql
+++ b/src/Sql/dbo/Tables/User.sql
@@ -1,40 +1,40 @@
 CREATE TABLE [dbo].[User] (
-    [Id]                              UNIQUEIDENTIFIER NOT NULL,
-    [Name]                            NVARCHAR (50)    NULL,
-    [Email]                           NVARCHAR (256)   NOT NULL,
-    [EmailVerified]                   BIT              NOT NULL,
-    [MasterPassword]                  NVARCHAR (300)   NULL,
-    [MasterPasswordHint]              NVARCHAR (50)    NULL,
-    [Culture]                         NVARCHAR (10)    NOT NULL,
-    [SecurityStamp]                   NVARCHAR (50)    NOT NULL,
-    [TwoFactorProviders]              NVARCHAR (MAX)   NULL,
-    [TwoFactorRecoveryCode]           NVARCHAR (32)    NULL,
-    [EquivalentDomains]               NVARCHAR (MAX)   NULL,
-    [ExcludedGlobalEquivalentDomains] NVARCHAR (MAX)   NULL,
-    [AccountRevisionDate]             DATETIME2 (7)    NOT NULL,
-    [Key]                             VARCHAR (MAX)    NULL,
-    [PublicKey]                       VARCHAR (MAX)    NULL,
-    [PrivateKey]                      VARCHAR (MAX)    NULL,
-    [Premium]                         BIT              NOT NULL,
-    [PremiumExpirationDate]           DATETIME2 (7)    NULL,
-    [RenewalReminderDate]             DATETIME2 (7)    NULL,
-    [Storage]                         BIGINT           NULL,
-    [MaxStorageGb]                    SMALLINT         NULL,
-    [Gateway]                         TINYINT          NULL,
-    [GatewayCustomerId]               VARCHAR (50)     NULL,
-    [GatewaySubscriptionId]           VARCHAR (50)     NULL,
-    [ReferenceData]                   NVARCHAR (MAX)   NULL,
-    [LicenseKey]                      VARCHAR (100)    NULL,
-    [Kdf]                             TINYINT          NOT NULL,
-    [KdfIterations]                   INT              NOT NULL,
-    [CreationDate]                    DATETIME2 (7)    NOT NULL,
-    [RevisionDate]                    DATETIME2 (7)    NOT NULL,
-    [ApiKey]                          VARCHAR (30)     NOT NULL,
-    [ForcePasswordReset]              BIT              NOT NULL,
-    [UsesKeyConnector]                BIT              NOT NULL,
-    [FailedLoginCount]                INT              NOT NULL,
-    [LastFailedLoginDate]             DATETIME2 (7)    NULL,
-    [UnknownDeviceVerificationEnabled]  BIT            NULL,
+    [Id]                               UNIQUEIDENTIFIER NOT NULL,
+    [Name]                             NVARCHAR (50)    NULL,
+    [Email]                            NVARCHAR (256)   NOT NULL,
+    [EmailVerified]                    BIT              NOT NULL,
+    [MasterPassword]                   NVARCHAR (300)   NULL,
+    [MasterPasswordHint]               NVARCHAR (50)    NULL,
+    [Culture]                          NVARCHAR (10)    NOT NULL,
+    [SecurityStamp]                    NVARCHAR (50)    NOT NULL,
+    [TwoFactorProviders]               NVARCHAR (MAX)   NULL,
+    [TwoFactorRecoveryCode]            NVARCHAR (32)    NULL,
+    [EquivalentDomains]                NVARCHAR (MAX)   NULL,
+    [ExcludedGlobalEquivalentDomains]  NVARCHAR (MAX)   NULL,
+    [AccountRevisionDate]              DATETIME2 (7)    NOT NULL,
+    [Key]                              VARCHAR (MAX)    NULL,
+    [PublicKey]                        VARCHAR (MAX)    NULL,
+    [PrivateKey]                       VARCHAR (MAX)    NULL,
+    [Premium]                          BIT              NOT NULL,
+    [PremiumExpirationDate]            DATETIME2 (7)    NULL,
+    [RenewalReminderDate]              DATETIME2 (7)    NULL,
+    [Storage]                          BIGINT           NULL,
+    [MaxStorageGb]                     SMALLINT         NULL,
+    [Gateway]                          TINYINT          NULL,
+    [GatewayCustomerId]                VARCHAR (50)     NULL,
+    [GatewaySubscriptionId]            VARCHAR (50)     NULL,
+    [ReferenceData]                    NVARCHAR (MAX)   NULL,
+    [LicenseKey]                       VARCHAR (100)    NULL,
+    [Kdf]                              TINYINT          NOT NULL,
+    [KdfIterations]                    INT              NOT NULL,
+    [CreationDate]                     DATETIME2 (7)    NOT NULL,
+    [RevisionDate]                     DATETIME2 (7)    NOT NULL,
+    [ApiKey]                           VARCHAR (30)     NOT NULL,
+    [ForcePasswordReset]               BIT              NOT NULL,
+    [UsesKeyConnector]                 BIT              NOT NULL,
+    [FailedLoginCount]                 INT              CONSTRAINT [D_User_FailedLoginCount] DEFAULT ((0)) NOT NULL,
+    [LastFailedLoginDate]              DATETIME2 (7)    NULL,
+    [UnknownDeviceVerificationEnabled] BIT              CONSTRAINT [D_User_UnknownDeviceVerificationEnabled] DEFAULT ((1)) NOT NULL,
     CONSTRAINT [PK_User] PRIMARY KEY CLUSTERED ([Id] ASC)
 );
 
diff --git a/src/Sql/dbo/Views/OrganizationSponsorship.sql b/src/Sql/dbo/Views/OrganizationSponsorship.sql
new file mode 100644
index 0000000000..8135d207d9
--- /dev/null
+++ b/src/Sql/dbo/Views/OrganizationSponsorship.sql
@@ -0,0 +1,6 @@
+CREATE VIEW [dbo].[OrganizationSponsorshipView]
+AS
+SELECT
+    *
+FROM
+    [dbo].[OrganizationSponsorship]
diff --git a/src/Sql/dbo/Views/OrganizationUserOrganizationDetailsView.sql b/src/Sql/dbo/Views/OrganizationUserOrganizationDetailsView.sql
index 01f327b085..edfb7e0f63 100644
--- a/src/Sql/dbo/Views/OrganizationUserOrganizationDetailsView.sql
+++ b/src/Sql/dbo/Views/OrganizationUserOrganizationDetailsView.sql
@@ -40,7 +40,7 @@ SELECT
     OS.[ValidUntil] FamilySponsorshipValidUntil
 FROM
     [dbo].[OrganizationUser] OU
-INNER JOIN
+LEFT JOIN
     [dbo].[Organization] O ON O.[Id] = OU.[OrganizationId]
 LEFT JOIN
     [dbo].[SsoUser] SU ON SU.[UserId] = OU.[UserId] AND SU.[OrganizationId] = OU.[OrganizationId]
diff --git a/src/Sql/dbo/Views/ProviderOrganizationOrganizationDetailsView.sql b/src/Sql/dbo/Views/ProviderOrganizationOrganizationDetailsView.sql
index 8f9dd88feb..21ce0d2da9 100644
--- a/src/Sql/dbo/Views/ProviderOrganizationOrganizationDetailsView.sql
+++ b/src/Sql/dbo/Views/ProviderOrganizationOrganizationDetailsView.sql
@@ -8,7 +8,10 @@ SELECT
     PO.[Key],
     PO.[Settings],
     PO.[CreationDate],
-    PO.[RevisionDate]
+    PO.[RevisionDate],
+    (SELECT COUNT(1) FROM [dbo].[OrganizationUser] OU WHERE OU.OrganizationId = PO.OrganizationId AND OU.Status = 2) UserCount,
+    O.[Seats],
+    O.[Plan]
 FROM
     [dbo].[ProviderOrganization] PO
 LEFT JOIN
diff --git a/util/Migrator/DbScripts/2018-02-28_00_LoginUris.sql b/util/Migrator/DbScripts/2018-02-28_00_LoginUris.sql
index 6e03d5c9fc..d2b3172def 100644
--- a/util/Migrator/DbScripts/2018-02-28_00_LoginUris.sql
+++ b/util/Migrator/DbScripts/2018-02-28_00_LoginUris.sql
@@ -14,6 +14,8 @@
 }
 */
 
+SET NOCOUNT ON;
+
 IF NOT EXISTS (SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'CompletedIds')
 BEGIN
     CREATE TABLE [CompletedIds] ([Id] UNIQUEIDENTIFIER PRIMARY KEY)
diff --git a/util/Migrator/DbScripts/2018-03-12_00_FixLoginUris.sql b/util/Migrator/DbScripts/2018-03-12_00_FixLoginUris.sql
index d45592dc2c..40599f346b 100644
--- a/util/Migrator/DbScripts/2018-03-12_00_FixLoginUris.sql
+++ b/util/Migrator/DbScripts/2018-03-12_00_FixLoginUris.sql
@@ -14,6 +14,8 @@
 }
 */
 
+SET NOCOUNT ON;
+
 IF NOT EXISTS (SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'CompletedIds')
 BEGIN
     CREATE TABLE [CompletedIds] ([Id] UNIQUEIDENTIFIER PRIMARY KEY)