Preparations for toggle support?