Better handling of field 'changed'