New plugin and some little improvements