Restructured Index and added more fields.