Actually load annotated plugins
Simplify plugin stuff