(COMMIT-18) Entity update