Update AddEntry() and complete the backlog