Changes in Controller class