Added relationships to models
Improve controller