Improved validations for all of the models