Replaced KVP with Tuple, added other key defindex