Added some validations