Add some validations