New plugin and fixes