Improvements and support for adding an entry with a specific id.