Validations added and updated