added KW_COMMAND keyword