Updated wrapper classes for 2.2.