Change models, add associations, add validations