Update commercial switches

cc @gklopper