Add a minimal plugin manager
Minor changes