Modify SubscriberGroupServiceImpl and SubscriberServiceImpl