upgrade marshal definition with cc/ec