Added associations and validations