Added embedding mapping ability