Exception updated, raw fields defined as constants