Small refactor for EntriesCollections