Rewrite command constants to use an enum