Simplified some Plguins