Added user group and user data object and classes