Move to data-mapper-bundle