Updated the use of datatype properties for identifiers.