Updates needed for new Configuration API