Change to support fetching more than 2000 entries