Plugin o rama

General improvements to the plugin support