Switch Bundle to Plugin