Changed names from service to manager