Cleaning up the update method to use a consistent implementation for populating the entry dictionary.