Updated with latest v2.2 changes and enhancements.