refactor(switch): refactor for spec changes