diff --git a/indexer-service-azure/src/main/java/org/opendes/indexer/azure/di/EntitlementsFactoryAzure.java b/indexer-service-azure/src/main/java/org/opendes/indexer/azure/di/EntitlementsFactoryAzure.java
index b4dc544dfcffbae670d1f5deada5ffcfe98b1ccf..2fcb59c3ea2310c641a42eb1103df60493900c51 100644
--- a/indexer-service-azure/src/main/java/org/opendes/indexer/azure/di/EntitlementsFactoryAzure.java
+++ b/indexer-service-azure/src/main/java/org/opendes/indexer/azure/di/EntitlementsFactoryAzure.java
@@ -1,12 +1,30 @@
+//  Copyright © Microsoft Corporation
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//       http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+
 package org.opendes.indexer.azure.di;
 
-import org.opendes.client.api.DpsHeaders;
-import org.opendes.client.api.entitlements.IEntitlementsFactory;
-import org.opendes.client.api.entitlements.IEntitlementsService;
+import org.opengroup.osdu.client.api.DpsHeaders;
+import org.opengroup.osdu.client.api.entitlements.IEntitlementsFactory;
+import org.opengroup.osdu.client.api.entitlements.IEntitlementsService;
+import org.springframework.context.annotation.Primary;
+import org.springframework.stereotype.Component;
 
+@Component
+@Primary
 public class EntitlementsFactoryAzure implements IEntitlementsFactory {
     @Override
-    public IEntitlementsService create(DpsHeaders headers) {
-        return new EntitlementsServiceAzure(headers);
+    public IEntitlementsService create(DpsHeaders dpsHeaders) {
+        return new EntitlementsServiceAzure(dpsHeaders);
     }
 }