match scala with persistor, remove immutable map