Handle multiple plugins more elegantly