tweaks to model to get data_mapper working