Eager loading

Changed the models and controllers to implement eager loading