DB-5671: xml persister refactored