Added an index to aid performance