Refactor ox-mapper to new API