Add Switch plugin and simplify bundle syntax