Removed service management class and added base management