added a few more fields for indexing