Improved IndexType support