Added relationships in model, added methods in controller