improve command consumer handling command