Temporarily adding map_store till it's fixed.