Changes in controller and utils