Relationships and validations added