Some updates to index