Adds further toggle support