Added validations and relationships