Refactor EntryItem