Added correct validations