Changes to EntryFactory class