Created separate controller and service