updates for features-2.0