Added controller and service