Added mapping functionality