_propertyTypeMap fix

_propertyTypeMap was not used to actually replace non-standard types. This is fixed now.