Re-work for New CMDProcessor