More Buildout 2.0 switches