diff --git a/hypertrace-trace-enricher/hypertrace-trace-enricher-impl/src/main/java/org/hypertrace/traceenricher/enrichment/enrichers/resolver/backend/JdbcBackendResolver.java b/hypertrace-trace-enricher/hypertrace-trace-enricher-impl/src/main/java/org/hypertrace/traceenricher/enrichment/enrichers/resolver/backend/JdbcBackendResolver.java
index 3b3bb93eb..ca6382727 100644
--- a/hypertrace-trace-enricher/hypertrace-trace-enricher-impl/src/main/java/org/hypertrace/traceenricher/enrichment/enrichers/resolver/backend/JdbcBackendResolver.java
+++ b/hypertrace-trace-enricher/hypertrace-trace-enricher-impl/src/main/java/org/hypertrace/traceenricher/enrichment/enrichers/resolver/backend/JdbcBackendResolver.java
@@ -77,7 +77,7 @@ public Optional<Entity> resolveEntity(Event event, StructuredTraceGraph structur
           EntityConstants.getValue(BackendAttribute.BACKEND_ATTRIBUTE_PATH),
           createAttributeValue(path));
     }
-    entityBuilder.putIdentifyingAttributes(RawSpanConstants.getValue(Sql.SQL_DB_TYPE),
+    entityBuilder.putAttributes(RawSpanConstants.getValue(Sql.SQL_DB_TYPE),
         createAttributeValue(dbType));
     return Optional.of(entityBuilder.build());
   }
diff --git a/hypertrace-trace-enricher/hypertrace-trace-enricher-impl/src/test/java/org/hypertrace/traceenricher/enrichment/enrichers/resolver/backend/BackendEntityResolverTest.java b/hypertrace-trace-enricher/hypertrace-trace-enricher-impl/src/test/java/org/hypertrace/traceenricher/enrichment/enrichers/resolver/backend/BackendEntityResolverTest.java
index c90cc40f5..4ba70d680 100644
--- a/hypertrace-trace-enricher/hypertrace-trace-enricher-impl/src/test/java/org/hypertrace/traceenricher/enrichment/enrichers/resolver/backend/BackendEntityResolverTest.java
+++ b/hypertrace-trace-enricher/hypertrace-trace-enricher-impl/src/test/java/org/hypertrace/traceenricher/enrichment/enrichers/resolver/backend/BackendEntityResolverTest.java
@@ -714,7 +714,7 @@ public void checkBackendEntityGeneratedFromJdbcEvent() {
                 .setRefType(EventRefType.CHILD_OF).build())).build();
     final Entity backendEntity = backendEntityResolver.resolveEntity(e, structuredTraceGraph).get();
     assertEquals("mysql:3306", backendEntity.getEntityName());
-    assertEquals(4, backendEntity.getIdentifyingAttributesCount());
+    assertEquals(3, backendEntity.getIdentifyingAttributesCount());
     Assertions.assertEquals(BackendType.JDBC.name(),
         backendEntity.getIdentifyingAttributesMap().get(Constants.getEntityConstant(BackendAttribute.BACKEND_ATTRIBUTE_PROTOCOL))
             .getValue().getString());
@@ -725,7 +725,7 @@ public void checkBackendEntityGeneratedFromJdbcEvent() {
         backendEntity.getIdentifyingAttributesMap().get(Constants.getEntityConstant(BackendAttribute.BACKEND_ATTRIBUTE_PORT)).getValue()
             .getString());
     assertEquals("mysql",
-        backendEntity.getIdentifyingAttributesMap().get(Constants.getRawSpanConstant(Sql.SQL_DB_TYPE)).getValue().getString());
+        backendEntity.getAttributesMap().get(Constants.getRawSpanConstant(Sql.SQL_DB_TYPE)).getValue().getString());
     assertEquals("jdbc.connection.prepare",
         backendEntity.getAttributesMap().get(Constants.getEnrichedSpanConstant(Backend.BACKEND_FROM_EVENT)).getValue().getString());
     assertEquals("62646630336466616266356337306638",
@@ -762,7 +762,7 @@ public void testGetBackendEntity() {
     assertEquals("mysql", idAttrMap.get(Constants.getEntityConstant(BackendAttribute.BACKEND_ATTRIBUTE_HOST)).getValue().getString());
     assertEquals("3306", idAttrMap.get(Constants.getEntityConstant(BackendAttribute.BACKEND_ATTRIBUTE_PORT)).getValue().getString());
     assertEquals("JDBC", idAttrMap.get(Constants.getEntityConstant(BackendAttribute.BACKEND_ATTRIBUTE_PROTOCOL)).getValue().getString());
-    assertEquals("mysql", idAttrMap.get(Constants.getRawSpanConstant(Sql.SQL_DB_TYPE)).getValue().getString());
+    assertEquals("mysql", backendEntity.getAttributesMap().get(Constants.getRawSpanConstant(Sql.SQL_DB_TYPE)).getValue().getString());
   }
 
   @Test
diff --git a/hypertrace-trace-enricher/hypertrace-trace-enricher-impl/src/test/java/org/hypertrace/traceenricher/enrichment/enrichers/resolver/backend/JdbcBackendResolverTest.java b/hypertrace-trace-enricher/hypertrace-trace-enricher-impl/src/test/java/org/hypertrace/traceenricher/enrichment/enrichers/resolver/backend/JdbcBackendResolverTest.java
index 5b9d1127a..b643a23e3 100644
--- a/hypertrace-trace-enricher/hypertrace-trace-enricher-impl/src/test/java/org/hypertrace/traceenricher/enrichment/enrichers/resolver/backend/JdbcBackendResolverTest.java
+++ b/hypertrace-trace-enricher/hypertrace-trace-enricher-impl/src/test/java/org/hypertrace/traceenricher/enrichment/enrichers/resolver/backend/JdbcBackendResolverTest.java
@@ -69,7 +69,7 @@ public void testWebgoatUrl() {
                 .setRefType(EventRefType.CHILD_OF).build())).build();
     final Entity backendEntity = jdbcBackendResolver.resolveEntity(e, structuredTraceGraph).get();
     assertEquals("dbhost:9001", backendEntity.getEntityName());
-    assertEquals(4, backendEntity.getIdentifyingAttributesCount());
+    assertEquals(3, backendEntity.getIdentifyingAttributesCount());
     Assertions.assertEquals(BackendType.JDBC.name(),
         backendEntity.getIdentifyingAttributesMap().get(Constants.getEntityConstant(
             BackendAttribute.BACKEND_ATTRIBUTE_PROTOCOL))
@@ -81,7 +81,7 @@ public void testWebgoatUrl() {
         backendEntity.getIdentifyingAttributesMap().get(Constants.getEntityConstant(BackendAttribute.BACKEND_ATTRIBUTE_PORT)).getValue()
             .getString());
     assertEquals("hsqldb",
-        backendEntity.getIdentifyingAttributesMap().get(Constants.getRawSpanConstant(Sql.SQL_DB_TYPE)).getValue().getString());
+        backendEntity.getAttributesMap().get(Constants.getRawSpanConstant(Sql.SQL_DB_TYPE)).getValue().getString());
     assertEquals("jdbc.connection.prepare",
         backendEntity.getAttributesMap().get(Constants.getEnrichedSpanConstant(Backend.BACKEND_FROM_EVENT)).getValue().getString());
     assertEquals("62646630336466616266356337306638",
@@ -133,7 +133,7 @@ public void testWithOtelFormatUrl() {
         backendEntity.getIdentifyingAttributesMap().get(Constants.getEntityConstant(BackendAttribute.BACKEND_ATTRIBUTE_PORT)).getValue()
             .getString());
     assertEquals("mysql",
-        backendEntity.getIdentifyingAttributesMap().get(Constants.getRawSpanConstant(Sql.SQL_DB_TYPE)).getValue().getString());
+        backendEntity.getAttributesMap().get(Constants.getRawSpanConstant(Sql.SQL_DB_TYPE)).getValue().getString());
     assertEquals("jdbc.connection.prepare",
         backendEntity.getAttributesMap().get(Constants.getEnrichedSpanConstant(Backend.BACKEND_FROM_EVENT)).getValue().getString());
     assertEquals("62646630336466616266356337306638",