Added all validations