Updated controllers and models for validations