Added basic validations