Added associations AND simple validations