Rfair/plugin additions