adding mapper support