Use the newly introduced enumerator's values in some cases