Added some more fields to index.