More work on expanding EntryLists