MapStoreWrapper minor improvements
Merge pull request #1069 from ahmetmircik/minorImprovements

MapStoreWrapper minor improvements (issue #1057)