Key switch is now easier to add into other packages