Add mapper support