Adjusted CCommand and CommandMgr to new Commands system