[TASK] Separate Persistence Layer from Flow PersistenceManager