Added dataType validations