DRAFT: added custom mapper support