Added mapping code