STORM-81 - For adding an entry, key i.e entry.id is not pre-conditional, this causes POST /tokens, POST /rules to fail