Persist outside of lib