added scenarios on mapping API