Changed loading of data in controller