OCLM-14 Add error fields to Item and Update, refactoring