Added a type to validator datatypes to provide better contextual error messages
Fix for warnings when generating models