- refactor persistence and services