Officially adding toggle support