PMO-2571: leaner persistance structure, more abstraction layers