Changes to SDK to support Ordino indexing