Add switch controller support