Modified and fixed validations