Small fix
Noisy updated version of PluginManager, needs more work
Added generics support