Added Group and Subscription entity.