Move associations over validations for consistency