Multistep workflow to enable mapping+

Multistep workflow to enable mapping