Changes in attempt to make the plugin logic work