This PR includes: - Use the correct module name in the examples - Small improvement in logic - Fix an issue where updating an existing entry could reset to defaults