Added fields for enum support.