Update to controller and service