Take advantage of new index entry types
Merge pull request #1 from Kapeli/master

Use new index entry types, thanks to Kapeli!