Adding some validations