Upgrade to Features 2.2