modify CommandType and CommandKey

-modify CommandType and CommandKey to be used by parser