Reworked the EntryManager to include the uopdated Entry.