Improvements to the plugin system
Soma parts still commented for debugging