Migrate to 2.2