draft custom mapper support