Remove index-decoding, handle that in schema