Add switch support to Clyde2