Fixed storage_simple_map return type