Updated CMachine helpers