Moved CSAFE enum into Commands