Added new 2.2 features