Class type on add/modify & error message changes