Updated state keys to put less strain on the switchblade device