Changes for implementing CreatorExternalReferenceResolverTest...