Added some more validations