Made individual plugins optional