add NonConfigurationInstance optimization