Added validations for all fields