Added mapping ability.