Added extra auto-validations and error messages