WIP Rewriting Persistance plugin to work with new domain model