Moved propertyTypes to the corresponding nodeTypes (as an experiment)