Minor cosmetic changes
Issue #22: Integrate map_store functionality, initially keeping backward
compatibility