Added mapping capability