Added mapping feature.