Add mapper related utils