onRetainNonConfigurationInstance is now onRetainCustomConfigurationInstance