Removed empty map for groups