Better support of const enum