Added mapping functionality.