Added Plugins, Masive refactoring