Add Extra switch support