preparing separation of persistor code