More data mapper changes
data mapper in progress