improved enum fields