New plugin + fixes