Move ROIBeans back to persistence plugin and encapsulate them in the
marshaller