Enhancements to the toggler plugin