Rfair/plugin updates