@dkubb mapper refactoring is next on our list once this PR is done.