diff --git a/ChatSDK.podspec b/ChatSDK.podspec
index 166d1d24..1aeeecc8 100755
--- a/ChatSDK.podspec
+++ b/ChatSDK.podspec
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "ChatSDK"
- s.version = "4.15.8"
+ s.version = "4.15.9"
s.summary = "Chat SDK - Mobile messaging framework for iOS"
s.homepage = "https://sdk.chat"
s.license = { :type => 'Chat SDK License', :file => 'LICENSE.md' }
diff --git a/ChatSDKCore/Classes/Interfaces/PStorageAdapter.h b/ChatSDKCore/Classes/Interfaces/PStorageAdapter.h
index 4ecf654e..8e5d8ecc 100755
--- a/ChatSDKCore/Classes/Interfaces/PStorageAdapter.h
+++ b/ChatSDKCore/Classes/Interfaces/PStorageAdapter.h
@@ -18,7 +18,6 @@
#define bUserAccountEntity @"CDUserAccount"
#define bMetaDataEntity @"CDMetaData"
#define bUserConnectionEntity @"CDUserConnection"
-#define bGroupEntity @"CDGroup"
#define bMessageOrderNewestFirst = 1;
#define bMessageOrderOldestFirst = 2;
diff --git a/ChatSDKCoreData/Assets/ChatSDK.xcdatamodeld/.xccurrentversion b/ChatSDKCoreData/Assets/ChatSDK.xcdatamodeld/.xccurrentversion
index 4c125157..877be3a9 100755
--- a/ChatSDKCoreData/Assets/ChatSDK.xcdatamodeld/.xccurrentversion
+++ b/ChatSDKCoreData/Assets/ChatSDK.xcdatamodeld/.xccurrentversion
@@ -3,6 +3,6 @@
_XCCurrentVersionName
- DataModel v025.xcdatamodel
+ DataModel v026.xcdatamodel
diff --git a/ChatSDKCoreData/Assets/ChatSDK.xcdatamodeld/DataModel v026.xcdatamodel/contents b/ChatSDKCoreData/Assets/ChatSDK.xcdatamodeld/DataModel v026.xcdatamodel/contents
new file mode 100644
index 00000000..e78eccea
--- /dev/null
+++ b/ChatSDKCoreData/Assets/ChatSDK.xcdatamodeld/DataModel v026.xcdatamodel/contents
@@ -0,0 +1,76 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ChatSDKCoreData/Classes/Entities/CDGroup+CoreDataProperties.h b/ChatSDKCoreData/Classes/Entities/CDGroup+CoreDataProperties.h
deleted file mode 100755
index 358ca34a..00000000
--- a/ChatSDKCoreData/Classes/Entities/CDGroup+CoreDataProperties.h
+++ /dev/null
@@ -1,33 +0,0 @@
-//
-// CDGroup+CoreDataProperties.h
-// Pods
-//
-// Created by Benjamin Smiley-andrews on 05/09/2016.
-//
-//
-// Choose "Create NSManagedObject Subclass…" from the Core Data editor menu
-// to delete and recreate this implementation file for your updated model.
-//
-
-#import "CDGroup.h"
-
-NS_ASSUME_NONNULL_BEGIN
-@class CDUserConnection;
-
-@interface CDGroup (CoreDataProperties)
-
-@property (nullable, nonatomic, retain) NSString *name;
-@property (nullable, nonatomic, retain) NSSet *userConnections;
-
-@end
-
-@interface CDGroup (CoreDataGeneratedAccessors)
-
-- (void)addUserConnectionsObject:(CDUserConnection *)value;
-- (void)removeUserConnectionsObject:(CDUserConnection *)value;
-- (void)addUserConnections:(NSSet *)values;
-- (void)removeUserConnections:(NSSet *)values;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/ChatSDKCoreData/Classes/Entities/CDGroup+CoreDataProperties.m b/ChatSDKCoreData/Classes/Entities/CDGroup+CoreDataProperties.m
deleted file mode 100755
index 68a350d6..00000000
--- a/ChatSDKCoreData/Classes/Entities/CDGroup+CoreDataProperties.m
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-// CDGroup+CoreDataProperties.m
-// Pods
-//
-// Created by Benjamin Smiley-andrews on 05/09/2016.
-//
-//
-// Choose "Create NSManagedObject Subclass…" from the Core Data editor menu
-// to delete and recreate this implementation file for your updated model.
-//
-
-#import "CDGroup+CoreDataProperties.h"
-
-@implementation CDGroup (CoreDataProperties)
-
-@dynamic name;
-@dynamic userConnections;
-
-@end
diff --git a/ChatSDKCoreData/Classes/Entities/CDGroup.h b/ChatSDKCoreData/Classes/Entities/CDGroup.h
deleted file mode 100755
index d590b466..00000000
--- a/ChatSDKCoreData/Classes/Entities/CDGroup.h
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-// CDGroup.h
-// Pods
-//
-// Created by Benjamin Smiley-andrews on 18/08/2016.
-//
-//
-
-#import
-#import
-
-#import
-
-@class CDLinkedContact;
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface CDGroup : NSManagedObject
-
-// Insert code here to declare functionality of your managed object subclass
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#import "CDGroup+CoreDataProperties.h"
diff --git a/ChatSDKCoreData/Classes/Entities/CDGroup.m b/ChatSDKCoreData/Classes/Entities/CDGroup.m
deleted file mode 100755
index 166d4521..00000000
--- a/ChatSDKCoreData/Classes/Entities/CDGroup.m
+++ /dev/null
@@ -1,16 +0,0 @@
-//
-// CDGroup.m
-// Pods
-//
-// Created by Benjamin Smiley-andrews on 18/08/2016.
-//
-//
-
-#import "CDGroup.h"
-#import "CDUserConnection.h"
-
-@implementation CDGroup
-
-// Insert code here to add functionality to your managed object subclass
-
-@end
diff --git a/ChatSDKCoreData/Classes/Entities/CDUserConnection+CoreDataProperties.h b/ChatSDKCoreData/Classes/Entities/CDUserConnection+CoreDataProperties.h
index 97ae0014..5cc9ecfe 100755
--- a/ChatSDKCoreData/Classes/Entities/CDUserConnection+CoreDataProperties.h
+++ b/ChatSDKCoreData/Classes/Entities/CDUserConnection+CoreDataProperties.h
@@ -18,18 +18,13 @@ NS_ASSUME_NONNULL_BEGIN
@property (nullable, nonatomic, retain) NSString *entityID;
@property (nullable, nonatomic, retain) id meta;
@property (nullable, nonatomic, retain) NSNumber *type;
-@property (nullable, nonatomic, retain) NSSet *groups;
@property (nullable, nonatomic, retain) CDUser *owner;
+@property (nullable, nonatomic, retain) NSString *userAccountID;
@end
@interface CDUserConnection (CoreDataGeneratedAccessors)
-- (void)addGroupsObject:(CDGroup *)value;
-- (void)removeGroupsObject:(CDGroup *)value;
-- (void)addGroups:(NSSet *)values;
-- (void)removeGroups:(NSSet *)values;
-
@end
NS_ASSUME_NONNULL_END
diff --git a/ChatSDKCoreData/Classes/Entities/CDUserConnection+CoreDataProperties.m b/ChatSDKCoreData/Classes/Entities/CDUserConnection+CoreDataProperties.m
index 0799e98b..dce4bd5a 100755
--- a/ChatSDKCoreData/Classes/Entities/CDUserConnection+CoreDataProperties.m
+++ b/ChatSDKCoreData/Classes/Entities/CDUserConnection+CoreDataProperties.m
@@ -16,7 +16,7 @@ @implementation CDUserConnection (CoreDataProperties)
@dynamic entityID;
@dynamic meta;
@dynamic type;
-@dynamic groups;
@dynamic owner;
+@dynamic userAccountID;
@end
diff --git a/ChatSDKCoreData/Classes/Entities/CDUserConnection.h b/ChatSDKCoreData/Classes/Entities/CDUserConnection.h
index 3dcf9445..c51cf3d6 100755
--- a/ChatSDKCoreData/Classes/Entities/CDUserConnection.h
+++ b/ChatSDKCoreData/Classes/Entities/CDUserConnection.h
@@ -10,7 +10,7 @@
#import
#import
-@class CDGroup, CDUser;
+@class CDUser;
NS_ASSUME_NONNULL_BEGIN
diff --git a/ChatSDKFirebase.podspec b/ChatSDKFirebase.podspec
index 3bab2354..18340934 100755
--- a/ChatSDKFirebase.podspec
+++ b/ChatSDKFirebase.podspec
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "ChatSDKFirebase"
- s.version = "4.15.8"
+ s.version = "4.15.9"
s.summary = "Chat SDK - Mobile messaging framework for iOS"
s.homepage = "https://sdk.chat"
s.license = { :type => 'Chat SDK License', :file => 'LICENSE.md' }