changes to datamapppers to handle ondemand mapping