MBST-1466 Persistence Refactor