added embedded map