Change the RawArg to an enum