Added some basic validations