ReferenceGeneratorProxy -> ReferenceGenerator