Add KeyIndex to Spec