Adding robust switch support.