Use our updated fork for map_store