Add toggle support