Refactoring setup: split persistent data handling