Refactoring now using findEntries