Add key index to setup