Added mapping system part