Map related changes
Merge pull request #1 from jayprakashj/master

Map related changes