now just PropertiesStep and PropertyMapStep. No more ValuesXXXStep.