Core refactoring for persitent-storage-interface (PSI)