wip: mongo mapper improvements