Adding date and number validations