Work on type indexing