Update models associations and validations