Some fixes + new plugin class