port work to new OFR plugin structure