Change to C++ standard enum