Use just only mapper dsl instance

Still not there with test coverage but I need a break from this