More update for v2.2