Added basic switch support.