Added logic for CompositeWidgetLocator