Added indexing of contracts.