CompositeLocator refactored to ReferenceComposite