More changes to add_entry