changes on how contracts are fetched