Take advantage of new index entry types