Resolved add/update issue