Adding basic validations