Add service manager and update the controller