Updated ServiceManager and MemberManager