Refactor: Reimplemented the MapArchive with proper SoC