added indexing to improve fetch performance