Persistence refactoring for external data