Adds toggle support