From 913a60a453f7cb14a46e8ce505550a1562f3229f Mon Sep 17 00:00:00 2001
From: "Donald F. Coffin" <dcoffin@greenbuttonalliance.org>
Date: Thu, 15 Jan 2026 23:05:30 -0500
Subject: [PATCH 1/2] refactor: Phase 16d - Remove IdentifiedObject mappings
 from MapStruct mappers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Remove IdentifiedObject field mappings and updateEntity() methods from all MapStruct mappers. The Atom protocol layer now exclusively handles IdentifiedObject metadata (id, uuid, description, published, updated, selfLink, upLink, relatedLinks).

Mapper Changes:
- Remove all IdentifiedObject field mappings (id, uuid, description, published, updated, links)
- Remove updateEntity() methods from all mappers
- Add @Mapping(target = "id", ignore = true) to prevent UUID→Long type conflicts
- Mappers now only handle XSD-defined fields

DTO Changes:
- UsageSummaryDto: Remove Atom metadata fields (published, updated, selfLink, upLink, relatedLinks, description)
- ElectricPowerQualitySummaryDto: Remove description field
- Update @XmlType propOrder to match reduced field sets
- Fix convenience constructors to match canonical constructor parameters

Test Enhancements:
- Fix DtoExportServiceImplTest reflection setup (remove obsolete dateTimeMapper)
- Add TimeConfiguration, UsageSummary, and ElectricPowerQualitySummary entries to export test
- Populate all test DTOs with comprehensive meaningful data instead of nulls
- Add assertions to validate XML serialization of all populated fields
- All 6 DtoExportServiceImplTest tests pass

Test Results:
- 580 tests run, 571 pass
- 9 pre-existing Jackson3XmlMarshallingTest failures (AtomContent deserialization - unrelated)
- DtoExportServiceImplTest: 6/6 pass with comprehensive field validation

This completes the separation of concerns between MapStruct mapping (XSD fields only) and Atom protocol handling (metadata fields).

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
---
 .../usage/ElectricPowerQualitySummaryDto.java |  28 ++--
 .../espi/common/dto/usage/UsagePointDto.java  | 124 +++++++++++++--
 .../common/dto/usage/UsageSummaryDto.java     |  42 +----
 .../customer/CustomerAccountMapper.java       |  58 ++-----
 .../customer/CustomerAgreementMapper.java     |  57 ++-----
 .../mapper/customer/CustomerMapper.java       |  50 +-----
 .../usage/ApplicationInformationMapper.java   |  31 +---
 .../mapper/usage/AuthorizationMapper.java     |  57 +------
 .../ElectricPowerQualitySummaryMapper.java    |  38 ++---
 .../mapper/usage/IntervalBlockMapper.java     |  19 +--
 .../mapper/usage/IntervalReadingMapper.java   |  10 --
 .../mapper/usage/MeterReadingMapper.java      |  17 +-
 .../mapper/usage/ReadingQualityMapper.java    |  10 --
 .../mapper/usage/ReadingTypeMapper.java       |  37 ++---
 .../mapper/usage/TimeConfigurationMapper.java |  36 +----
 .../common/mapper/usage/UsagePointMapper.java |  99 ++++++------
 .../mapper/usage/UsageSummaryMapper.java      |  73 ++-------
 .../common/Jackson3XmlMarshallingTest.java    | 147 ++++++++++++------
 .../common/MigrationVerificationTest.java     |  21 ++-
 .../espi/common/XmlDebugTest.java             |  60 ++++---
 .../common/dto/usage/SubscriptionDtoTest.java |   6 +-
 .../mapper/usage/SubscriptionMapperTest.java  |   2 +-
 .../impl/DtoExportServiceImplTest.java        | 135 +++++++++++++++-
 23 files changed, 550 insertions(+), 607 deletions(-)

diff --git a/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/dto/usage/ElectricPowerQualitySummaryDto.java b/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/dto/usage/ElectricPowerQualitySummaryDto.java
index a0eb2098..d2334cde 100644
--- a/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/dto/usage/ElectricPowerQualitySummaryDto.java
+++ b/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/dto/usage/ElectricPowerQualitySummaryDto.java
@@ -34,22 +34,19 @@
 @XmlRootElement(name = "ElectricPowerQualitySummary", namespace = "http://naesb.org/espi")
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "ElectricPowerQualitySummary", namespace = "http://naesb.org/espi", propOrder = {
-    "description", "flickerPlt", "flickerPst", "harmonicVoltage", "longInterruptions", 
-    "mainsVoltage", "measurementProtocol", "powerFrequency", "rapidVoltageChanges", 
-    "shortInterruptions", "summaryInterval", "supplyVoltageDips", "supplyVoltageImbalance", 
-    "supplyVoltageVariations", "tempOvervoltage", "usagePointId"
+    "flickerPlt", "flickerPst", "harmonicVoltage", "longInterruptions",
+    "mainsVoltage", "measurementProtocol", "powerFrequency", "rapidVoltageChanges",
+    "shortInterruptions", "summaryInterval", "supplyVoltageDips", "supplyVoltageImbalance",
+    "supplyVoltageVariations", "tempOvervoltage"
 })
 public record ElectricPowerQualitySummaryDto(
-    
+
     @XmlTransient
     Long id,
-    
+
     @XmlAttribute(name = "mRID")
     String uuid,
     
-    @XmlElement(name = "description")
-    String description,
-    
     /**
      * Flicker PLT (Long-term) measurement.
      * Represents long-term flicker severity as per IEC 61000-4-15.
@@ -181,19 +178,18 @@ public record ElectricPowerQualitySummaryDto(
      * Default constructor for JAXB.
      */
     public ElectricPowerQualitySummaryDto() {
-        this(null, null, null, null, null, null, null, null, null, null, null, null, null, 
-             null, null, null, null, null);
+        this(null, null, null, null, null, null, null, null, null, null, null,
+             null, null, null, null, null, null);
     }
-    
+
     /**
      * Constructor with basic identification.
-     * 
+     *
      * @param id the database identifier
      * @param uuid the unique resource identifier
-     * @param description human-readable description
      */
-    public ElectricPowerQualitySummaryDto(Long id, String uuid, String description) {
-        this(id, uuid, description, null, null, null, null, null, null, null, null, null, 
+    public ElectricPowerQualitySummaryDto(Long id, String uuid) {
+        this(id, uuid, null, null, null, null, null, null, null, null, null,
              null, null, null, null, null, null);
     }
     
diff --git a/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/dto/usage/UsagePointDto.java b/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/dto/usage/UsagePointDto.java
index f947b820..46080d19 100644
--- a/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/dto/usage/UsagePointDto.java
+++ b/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/dto/usage/UsagePointDto.java
@@ -19,7 +19,10 @@
 
 package org.greenbuttonalliance.espi.common.dto.usage;
 
+import org.greenbuttonalliance.espi.common.domain.common.AmiBillingReadyKind;
+import org.greenbuttonalliance.espi.common.domain.common.PhaseCodeKind;
 import org.greenbuttonalliance.espi.common.domain.common.ServiceCategory;
+import org.greenbuttonalliance.espi.common.domain.common.UsagePointConnectedKind;
 import org.greenbuttonalliance.espi.common.dto.SummaryMeasurementDto;
 
 import jakarta.xml.bind.annotation.*;
@@ -36,18 +39,18 @@
 @XmlRootElement(name = "UsagePoint", namespace = "http://naesb.org/espi")
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "UsagePoint", namespace = "http://naesb.org/espi", propOrder = {
-    "description", "roleFlags", "serviceCategory", "status", "estimatedLoad",
-    "nominalServiceVoltage", "ratedCurrent", "ratedPower", "serviceDeliveryPoint",
-    "pnodeRefs", "aggregatedNodeRefs"
+    "roleFlags", "serviceCategory", "status", "serviceDeliveryPoint",
+    "amiBillingReady", "checkBilling", "connectionState", "estimatedLoad",
+    "grounded", "isSdp", "isVirtual", "minimalUsageExpected",
+    "nominalServiceVoltage", "outageRegion", "phaseCode", "ratedCurrent",
+    "ratedPower", "readCycle", "readRoute", "serviceDeliveryRemark",
+    "servicePriority", "pnodeRefs", "aggregatedNodeRefs"
 })
 public record UsagePointDto(
 
     @XmlTransient
     String uuid,
 
-    @XmlElement(name = "description")
-    String description,
-
     @XmlElement(name = "roleFlags", type = String.class)
     @XmlJavaTypeAdapter(HexBinaryAdapter.class)
     byte[] roleFlags,
@@ -58,18 +61,84 @@ public record UsagePointDto(
     @XmlElement(name = "status")
     Short status,
 
+    @XmlElement(name = "ServiceDeliveryPoint")
+    ServiceDeliveryPointDto serviceDeliveryPoint,
+
+    /**
+     * Lifecycle states of the metering installation with respect to readiness for billing via AMI reads.
+     * Per ESPI 4.0 XSD: [extension] AmiBillingReadyKind enum.
+     */
+    @XmlElement(name = "amiBillingReady")
+    AmiBillingReadyKind amiBillingReady,
+
+    /**
+     * True if there is a reason to suspect that a previous billing may have been performed with erroneous data.
+     * Per ESPI 4.0 XSD: [extension] boolean field.
+     */
+    @XmlElement(name = "checkBilling")
+    Boolean checkBilling,
+
+    /**
+     * State of the usage point with respect to connection to the network.
+     * Per ESPI 4.0 XSD: [extension] UsagePointConnectedKind enum.
+     */
+    @XmlElement(name = "connectionState")
+    UsagePointConnectedKind connectionState,
+
     /**
      * Estimated load for the usage point as SummaryMeasurement.
      */
     @XmlElement(name = "estimatedLoad")
     SummaryMeasurementDto estimatedLoad,
 
+    /**
+     * True if grounded.
+     * Per ESPI 4.0 XSD: [extension] boolean field.
+     */
+    @XmlElement(name = "grounded")
+    Boolean grounded,
+
+    /**
+     * True if this usage point is a service delivery point.
+     * Per ESPI 4.0 XSD: [extension] boolean field.
+     */
+    @XmlElement(name = "isSdp")
+    Boolean isSdp,
+
+    /**
+     * True if this usage point is virtual (no physical location exists).
+     * Per ESPI 4.0 XSD: [extension] boolean field.
+     */
+    @XmlElement(name = "isVirtual")
+    Boolean isVirtual,
+
+    /**
+     * True if minimal or zero usage is expected at this usage point.
+     * Per ESPI 4.0 XSD: [extension] boolean field.
+     */
+    @XmlElement(name = "minimalUsageExpected")
+    Boolean minimalUsageExpected,
+
     /**
      * Nominal service voltage for the usage point as SummaryMeasurement.
      */
     @XmlElement(name = "nominalServiceVoltage")
     SummaryMeasurementDto nominalServiceVoltage,
 
+    /**
+     * Outage region in which this usage point is located.
+     * Per ESPI 4.0 XSD: [extension] String256 field.
+     */
+    @XmlElement(name = "outageRegion")
+    String outageRegion,
+
+    /**
+     * Phase code indicating number of wires and specific nominal phases.
+     * Per ESPI 4.0 XSD: [extension] PhaseCodeKind enum.
+     */
+    @XmlElement(name = "phaseCode")
+    PhaseCodeKind phaseCode,
+
     /**
      * Rated current for the usage point as SummaryMeasurement.
      */
@@ -82,8 +151,33 @@ public record UsagePointDto(
     @XmlElement(name = "ratedPower")
     SummaryMeasurementDto ratedPower,
 
-    @XmlElement(name = "ServiceDeliveryPoint")
-    ServiceDeliveryPointDto serviceDeliveryPoint,
+    /**
+     * Cycle day on which the meter will normally be read.
+     * Per ESPI 4.0 XSD: [extension] String256 field.
+     */
+    @XmlElement(name = "readCycle")
+    String readCycle,
+
+    /**
+     * Route identifier for meter reading purposes.
+     * Per ESPI 4.0 XSD: [extension] String256 field.
+     */
+    @XmlElement(name = "readRoute")
+    String readRoute,
+
+    /**
+     * Remarks about this usage point.
+     * Per ESPI 4.0 XSD: [extension] String256 field.
+     */
+    @XmlElement(name = "serviceDeliveryRemark")
+    String serviceDeliveryRemark,
+
+    /**
+     * Priority of service for this usage point.
+     * Per ESPI 4.0 XSD: [extension] String32 field.
+     */
+    @XmlElement(name = "servicePriority")
+    String servicePriority,
 
     /**
      * Array of pricing node references.
@@ -112,7 +206,8 @@ public record UsagePointDto(
      * Default constructor for JAXB.
      */
     public UsagePointDto() {
-        this(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+        this(null, null, null, null, null, null, null, null, null, null, null, null, null, null,
+             null, null, null, null, null, null, null, null, null, null, null, null, null);
     }
 
     /**
@@ -122,14 +217,14 @@ public UsagePointDto() {
      * @param serviceCategory the service category
      */
     public UsagePointDto(String uuid, ServiceCategory serviceCategory) {
-        this(uuid, null, null, serviceCategory, null, null, null, null, null, null, null, null, null, null, null);
+        this(uuid, null, serviceCategory, null, null, null, null, null, null, null, null, null, null,
+             null, null, null, null, null, null, null, null, null, null, null, null, null, null);
     }
 
     /**
      * Constructor with core ESPI elements.
      *
      * @param uuid the resource identifier
-     * @param description human-readable description
      * @param serviceCategory the service category
      * @param estimatedLoad estimated load measurement
      * @param nominalServiceVoltage nominal voltage measurement
@@ -137,12 +232,13 @@ public UsagePointDto(String uuid, ServiceCategory serviceCategory) {
      * @param ratedPower rated power measurement
      * @param serviceDeliveryPoint service delivery point details
      */
-    public UsagePointDto(String uuid, String description, ServiceCategory serviceCategory,
+    public UsagePointDto(String uuid, ServiceCategory serviceCategory,
                         SummaryMeasurementDto estimatedLoad, SummaryMeasurementDto nominalServiceVoltage,
                         SummaryMeasurementDto ratedCurrent, SummaryMeasurementDto ratedPower,
                         ServiceDeliveryPointDto serviceDeliveryPoint) {
-        this(uuid, description, null, serviceCategory, null, estimatedLoad, nominalServiceVoltage,
-             ratedCurrent, ratedPower, serviceDeliveryPoint, null, null, null, null, null);
+        this(uuid, null, serviceCategory, null, serviceDeliveryPoint, null, null, null, estimatedLoad,
+             null, null, null, null, nominalServiceVoltage, null, null, ratedCurrent, ratedPower,
+             null, null, null, null, null, null, null, null, null);
     }
 
     /**
diff --git a/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/dto/usage/UsageSummaryDto.java b/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/dto/usage/UsageSummaryDto.java
index 25e203e0..c69a25ce 100644
--- a/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/dto/usage/UsageSummaryDto.java
+++ b/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/dto/usage/UsageSummaryDto.java
@@ -39,7 +39,7 @@
 @XmlRootElement(name = "UsageSummary", namespace = "http://naesb.org/espi")
 @XmlAccessorType(XmlAccessType.PROPERTY)
 @XmlType(name = "UsageSummary", namespace = "http://naesb.org/espi", propOrder = {
-    "description", "billingPeriod", "billLastPeriod", "billToDate",
+    "billingPeriod", "billLastPeriod", "billToDate",
     "costAdditionalLastPeriod", "costAdditionalDetailLastPeriod", "currency",
     "overallConsumptionLastPeriod", "currentBillingPeriodOverAllConsumption",
     "currentDayLastYearNetConsumption", "currentDayNetConsumption",
@@ -56,22 +56,6 @@ public record UsageSummaryDto(
     @XmlAttribute(name = "mRID")
     String uuid,
 
-    @XmlTransient
-    OffsetDateTime published,
-
-    @XmlTransient
-    OffsetDateTime updated,
-
-    @XmlTransient
-    LinkDto selfLink,
-
-    @XmlTransient
-    LinkDto upLink,
-
-    @XmlTransient
-    List<LinkDto> relatedLinks,
-
-    String description,
     DateTimeIntervalDto billingPeriod,
     Long billLastPeriod,
     Long billToDate,
@@ -98,15 +82,6 @@ public record UsageSummaryDto(
     BillingChargeSourceDto billingChargeSource
 ) {
 
-    /**
-     * Description of the usage summary.
-     * Inherited from IdentifiedObject.
-     */
-    @XmlElement(name = "description")
-    public String getDescription() {
-        return description;
-    }
-
     /**
      * The billing period to which the included measurements apply.
      * May also be an off-bill arbitrary period.
@@ -341,8 +316,7 @@ public BillingChargeSourceDto getBillingChargeSource() {
     public UsageSummaryDto() {
         this(null, null, null, null, null, null, null, null,
              null, null, null, null, null, null, null, null,
-             null, null, null, null, null, null, null, null,
-             null, null, null, null, null, null, null, null);
+             null, null, null, null, null, null, null, null, null, null);
     }
 
     /**
@@ -352,9 +326,9 @@ public UsageSummaryDto() {
      * @param statusTimeStamp the status timestamp (required)
      */
     public UsageSummaryDto(String uuid, Long statusTimeStamp) {
-        this(null, uuid, null, null, null, null, null, null, null, null, null, null,
-             null, null, null, null, null, null, null, null, null, null, null, null,
-             null, null, statusTimeStamp, null, null, null, null, null);
+        this(null, uuid, null, null, null, null, null, null,
+             null, null, null, null, null, null, null, null,
+             null, null, null, null, statusTimeStamp, null, null, null, null, null);
     }
 
     /**
@@ -365,8 +339,8 @@ public UsageSummaryDto(String uuid, Long statusTimeStamp) {
      * @param statusTimeStamp the status timestamp (required)
      */
     public UsageSummaryDto(String uuid, DateTimeIntervalDto billingPeriod, Long statusTimeStamp) {
-        this(null, uuid, null, null, null, null, null, null, billingPeriod, null, null, null,
-             null, null, null, null, null, null, null, null, null, null, null, null,
-             null, null, statusTimeStamp, null, null, null, null, null);
+        this(null, uuid, billingPeriod, null, null, null, null, null,
+             null, null, null, null, null, null, null, null,
+             null, null, null, null, statusTimeStamp, null, null, null, null, null);
     }
 }
diff --git a/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/mapper/customer/CustomerAccountMapper.java b/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/mapper/customer/CustomerAccountMapper.java
index 14021c42..c4eb3336 100644
--- a/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/mapper/customer/CustomerAccountMapper.java
+++ b/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/mapper/customer/CustomerAccountMapper.java
@@ -29,9 +29,12 @@
 
 /**
  * MapStruct mapper for converting between CustomerAccountEntity and CustomerAccountDto.
- * 
- * Handles the conversion between the JPA entity used for persistence and the DTO 
+ * <p>
+ * Handles the conversion between the JPA entity used for persistence and the DTO
  * used for JAXB XML marshalling in the Green Button API.
+ * <p>
+ * Maps only customer.xsd CustomerAccount fields. IdentifiedObject fields are NOT part of
+ * the customer.xsd CustomerAccount definition and are handled by AtomFeedDto/AtomEntryDto.
  */
 @Mapper(componentModel = "spring", uses = {
     DateTimeMapper.class,
@@ -41,19 +44,12 @@ public interface CustomerAccountMapper {
 
     /**
      * Converts a CustomerAccountEntity to a CustomerAccountDto.
-     * Maps customer account information and billing details.
-     * 
+     * Maps only customer.xsd CustomerAccount fields.
+     *
      * @param entity the customer account entity
      * @return the customer account DTO
      */
-    @Mapping(target = "id", ignore = true) // DTO uses Long, entity uses UUID
-    @Mapping(target = "uuid", source = "id", qualifiedByName = "uuidToString")
-    @Mapping(target = "published", source = "published", qualifiedByName = "localToOffset")
-    @Mapping(target = "updated", source = "updated", qualifiedByName = "localToOffset")
-    @Mapping(target = "relatedLinks", ignore = true) // Links handled separately
-    @Mapping(target = "selfLink", ignore = true)
-    @Mapping(target = "upLink", ignore = true)
-    @Mapping(target = "description", source = "description")
+    @Mapping(target = "id", ignore = true) // IdentifiedObject field handled by Atom layer
     @Mapping(target = "accountId", source = "accountId")
     @Mapping(target = "accountNumber", ignore = true) // Not in entity
     @Mapping(target = "budgetBill", source = "budgetBill")
@@ -67,15 +63,12 @@ public interface CustomerAccountMapper {
 
     /**
      * Converts a CustomerAccountDto to a CustomerAccountEntity.
-     * Maps customer account information and billing details.
-     * 
+     * Maps only customer.xsd CustomerAccount fields.
+     *
      * @param dto the customer account DTO
      * @return the customer account entity
      */
-    @Mapping(target = "id", source = "uuid", qualifiedByName = "stringToUuid")
-    @Mapping(target = "published", source = "published", qualifiedByName = "offsetToLocal")
-    @Mapping(target = "updated", source = "updated", qualifiedByName = "offsetToLocal")
-    @Mapping(target = "description", source = "description")
+    @Mapping(target = "id", ignore = true) // IdentifiedObject field handled by Atom layer
     @Mapping(target = "accountId", source = "accountId")
     @Mapping(target = "budgetBill", source = "budgetBill")
     @Mapping(target = "billingCycle", source = "billingCycle")
@@ -83,33 +76,6 @@ public interface CustomerAccountMapper {
     @Mapping(target = "isPrePay", source = "isPrePay")
     @Mapping(target = "notifications", ignore = true) // Relationship handled separately
     @Mapping(target = "contactInfo", ignore = true) // Relationship handled separately
-    @Mapping(target = "relatedLinks", ignore = true)
-    @Mapping(target = "selfLink", ignore = true)
-    @Mapping(target = "upLink", ignore = true)
     CustomerAccountEntity toEntity(CustomerAccountDto dto);
 
-    /**
-     * Updates an existing CustomerAccountEntity with data from a CustomerAccountDto.
-     * Useful for merge operations where the entity ID should be preserved.
-     * 
-     * @param dto the source DTO
-     * @param entity the target entity to update
-     */
-    @Mapping(target = "type", ignore = true)
-    @Mapping(target = "title", ignore = true)
-    @Mapping(target = "subject", ignore = true)
-    @Mapping(target = "revisionNumber", ignore = true)
-    @Mapping(target = "lastModifiedDateTime", ignore = true)
-    @Mapping(target = "createdDateTime", ignore = true)
-    @Mapping(target = "created", ignore = true)
-    @Mapping(target = "id", ignore = true)
-    @Mapping(target = "published", source = "published", qualifiedByName = "offsetToLocal")
-    @Mapping(target = "updated", source = "updated", qualifiedByName = "offsetToLocal")
-    @Mapping(target = "isPrePay", source = "isPrePay")
-    @Mapping(target = "notifications", ignore = true) // Relationship handled separately
-    @Mapping(target = "contactInfo", ignore = true) // Relationship handled separately
-    @Mapping(target = "relatedLinks", ignore = true)
-    @Mapping(target = "selfLink", ignore = true)
-    @Mapping(target = "upLink", ignore = true)
-    void updateEntity(CustomerAccountDto dto, @MappingTarget CustomerAccountEntity entity);
-}
\ No newline at end of file
+}
diff --git a/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/mapper/customer/CustomerAgreementMapper.java b/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/mapper/customer/CustomerAgreementMapper.java
index 5ab819c1..e873ec44 100644
--- a/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/mapper/customer/CustomerAgreementMapper.java
+++ b/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/mapper/customer/CustomerAgreementMapper.java
@@ -29,9 +29,12 @@
 
 /**
  * MapStruct mapper for converting between CustomerAgreementEntity and CustomerAgreementDto.
- * 
- * Handles the conversion between the JPA entity used for persistence and the DTO 
+ * <p>
+ * Handles the conversion between the JPA entity used for persistence and the DTO
  * used for JAXB XML marshalling in the Green Button API.
+ * <p>
+ * Maps only customer.xsd CustomerAgreement fields. IdentifiedObject fields are NOT part of
+ * the customer.xsd CustomerAgreement definition and are handled by AtomFeedDto/AtomEntryDto.
  */
 @Mapper(componentModel = "spring", uses = {
     DateTimeMapper.class,
@@ -41,19 +44,12 @@ public interface CustomerAgreementMapper {
 
     /**
      * Converts a CustomerAgreementEntity to a CustomerAgreementDto.
-     * Maps customer agreement information and service terms.
-     * 
+     * Maps only customer.xsd CustomerAgreement fields.
+     *
      * @param entity the customer agreement entity
      * @return the customer agreement DTO
      */
-    @Mapping(target = "id", ignore = true) // DTO uses Long, entity uses UUID
-    @Mapping(target = "uuid", source = "id", qualifiedByName = "uuidToString")
-    @Mapping(target = "published", source = "published", qualifiedByName = "localToOffset")
-    @Mapping(target = "updated", source = "updated", qualifiedByName = "localToOffset")
-    @Mapping(target = "relatedLinks", ignore = true) // Links handled separately
-    @Mapping(target = "selfLink", ignore = true)
-    @Mapping(target = "upLink", ignore = true)
-    @Mapping(target = "description", source = "description")
+    @Mapping(target = "id", ignore = true) // IdentifiedObject field handled by Atom layer
     @Mapping(target = "signDate", source = "signDate")
     @Mapping(target = "validityInterval", ignore = true) // Complex mapping
     @Mapping(target = "customerAccount", ignore = true) // Relationship handled separately
@@ -63,49 +59,20 @@ public interface CustomerAgreementMapper {
 
     /**
      * Converts a CustomerAgreementDto to a CustomerAgreementEntity.
-     * Maps customer agreement information and service terms.
-     * 
+     * Maps only customer.xsd CustomerAgreement fields.
+     *
      * @param dto the customer agreement DTO
      * @return the customer agreement entity
      */
-    @Mapping(target = "id", source = "uuid", qualifiedByName = "stringToUuid")
-    @Mapping(target = "published", source = "published", qualifiedByName = "offsetToLocal")
-    @Mapping(target = "updated", source = "updated", qualifiedByName = "offsetToLocal")
-    @Mapping(target = "description", source = "description")
+    @Mapping(target = "id", ignore = true) // IdentifiedObject field handled by Atom layer
     @Mapping(target = "signDate", source = "signDate")
     @Mapping(target = "validityInterval", ignore = true) // Complex mapping
-    @Mapping(target = "created", ignore = true) // Inherited from IdentifiedObject
     @Mapping(target = "createdDateTime", ignore = true) // From Document
     @Mapping(target = "lastModifiedDateTime", ignore = true) // From Document
     @Mapping(target = "revisionNumber", ignore = true) // From Document
     @Mapping(target = "subject", ignore = true) // From Document
     @Mapping(target = "title", ignore = true) // From Document
     @Mapping(target = "type", ignore = true) // From Document
-    @Mapping(target = "relatedLinks", ignore = true)
-    @Mapping(target = "selfLink", ignore = true)
-    @Mapping(target = "upLink", ignore = true)
     CustomerAgreementEntity toEntity(CustomerAgreementDto dto);
 
-    /**
-     * Updates an existing CustomerAgreementEntity with data from a CustomerAgreementDto.
-     * Useful for merge operations where the entity ID should be preserved.
-     * 
-     * @param dto the source DTO
-     * @param entity the target entity to update
-     */
-    @Mapping(target = "id", ignore = true)
-    @Mapping(target = "published", source = "published", qualifiedByName = "offsetToLocal")
-    @Mapping(target = "updated", source = "updated", qualifiedByName = "offsetToLocal")
-    @Mapping(target = "validityInterval", ignore = true) // Complex mapping
-    @Mapping(target = "created", ignore = true) // Inherited from IdentifiedObject
-    @Mapping(target = "createdDateTime", ignore = true) // From Document
-    @Mapping(target = "lastModifiedDateTime", ignore = true) // From Document
-    @Mapping(target = "revisionNumber", ignore = true) // From Document
-    @Mapping(target = "subject", ignore = true) // From Document
-    @Mapping(target = "title", ignore = true) // From Document
-    @Mapping(target = "type", ignore = true) // From Document
-    @Mapping(target = "relatedLinks", ignore = true)
-    @Mapping(target = "selfLink", ignore = true)
-    @Mapping(target = "upLink", ignore = true)
-    void updateEntity(CustomerAgreementDto dto, @MappingTarget CustomerAgreementEntity entity);
-}
\ No newline at end of file
+}
diff --git a/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/mapper/customer/CustomerMapper.java b/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/mapper/customer/CustomerMapper.java
index 24f04b78..105fb913 100644
--- a/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/mapper/customer/CustomerMapper.java
+++ b/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/mapper/customer/CustomerMapper.java
@@ -35,8 +35,11 @@
 
 /**
  * MapStruct mapper for converting between CustomerEntity and CustomerDto.
- * 
- * Handles the conversion between the JPA entity used for persistence and the DTO 
+ *
+ * Maps only Customer fields. IdentifiedObject fields are NOT part of the customer.xsd
+ * definition and are handled by AtomFeedDto/AtomEntryDto.
+ *
+ * Handles the conversion between the JPA entity used for persistence and the DTO
  * used for JAXB XML marshalling in the Green Button API.
  */
 @Mapper(componentModel = "spring", uses = {
@@ -47,11 +50,10 @@ public interface CustomerMapper extends BaseMapperUtils {
     /**
      * Converts a CustomerEntity to a CustomerDto.
      * Maps customer information including embedded objects.
-     * 
+     *
      * @param entity the customer entity
      * @return the customer DTO
      */
-    @Mapping(target = "uuid", source = "id", qualifiedByName = "uuidToString")
     @Mapping(target = "organisationRole", source = ".", qualifiedByName = "mapOrganisationRole")
     @Mapping(target = "kind", source = "kind")
     @Mapping(target = "specialNeed", source = "specialNeed")
@@ -66,11 +68,10 @@ public interface CustomerMapper extends BaseMapperUtils {
     /**
      * Converts a CustomerDto to a CustomerEntity.
      * Maps customer information including embedded objects.
-     * 
+     *
      * @param dto the customer DTO
      * @return the customer entity
      */
-    @Mapping(target = "id", source = "uuid", qualifiedByName = "stringToUuid")
     @Mapping(target = "organisation", source = "organisationRole", qualifiedByName = "mapOrganisation")
     @Mapping(target = "phoneNumbers", ignore = true)
     @Mapping(target = "kind", source = "kind")
@@ -84,45 +85,8 @@ public interface CustomerMapper extends BaseMapperUtils {
     @Mapping(target = "customerAccounts", ignore = true)
     @Mapping(target = "timeConfiguration", ignore = true)
     @Mapping(target = "statements", ignore = true)
-    @Mapping(target = "created", ignore = true)
-    @Mapping(target = "updated", ignore = true)
-    @Mapping(target = "published", ignore = true)
-    @Mapping(target = "relatedLinks", ignore = true)
-    @Mapping(target = "selfLink", ignore = true)
-    @Mapping(target = "upLink", ignore = true)
-    @Mapping(target = "description", ignore = true)
     CustomerEntity toEntity(CustomerDto dto);
 
-    /**
-     * Updates an existing CustomerEntity with data from a CustomerDto.
-     * Useful for merge operations where the entity ID should be preserved.
-     * 
-     * @param dto the source DTO
-     * @param entity the target entity to update
-     */
-    @Mapping(target = "id", ignore = true)
-    @Mapping(target = "organisation", source = "organisationRole", qualifiedByName = "mapOrganisation")
-    @Mapping(target = "phoneNumbers", ignore = true)
-    @Mapping(target = "kind", source = "kind")
-    @Mapping(target = "specialNeed", source = "specialNeed")
-    @Mapping(target = "vip", source = "vip")
-    @Mapping(target = "pucNumber", source = "pucNumber")
-    @Mapping(target = "status", source = "status")
-    @Mapping(target = "priority", source = "priority")
-    @Mapping(target = "locale", source = "locale")
-    @Mapping(target = "customerName", source = "customerName")
-    @Mapping(target = "customerAccounts", ignore = true)
-    @Mapping(target = "timeConfiguration", ignore = true)
-    @Mapping(target = "statements", ignore = true)
-    @Mapping(target = "created", ignore = true)
-    @Mapping(target = "updated", ignore = true)
-    @Mapping(target = "published", ignore = true)
-    @Mapping(target = "relatedLinks", ignore = true)
-    @Mapping(target = "selfLink", ignore = true)
-    @Mapping(target = "upLink", ignore = true)
-    @Mapping(target = "description", ignore = true)
-    void updateEntity(CustomerDto dto, @MappingTarget CustomerEntity entity);
-
     /**
      * Maps CustomerEntity with PhoneNumberEntity list to OrganisationRoleDto.
      * Combines embedded Organisation data with separate phone number entities.
diff --git a/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/mapper/usage/ApplicationInformationMapper.java b/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/mapper/usage/ApplicationInformationMapper.java
index 22774784..b8f318dc 100644
--- a/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/mapper/usage/ApplicationInformationMapper.java
+++ b/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/mapper/usage/ApplicationInformationMapper.java
@@ -30,6 +30,9 @@
 /**
  * MapStruct mapper for converting between ApplicationInformationEntity and ApplicationInformationDto.
  *
+ * Maps only ApplicationInformation fields. IdentifiedObject fields are NOT part of the usage.xsd
+ * definition and are handled by AtomFeedDto/AtomEntryDto.
+ *
  * Handles the conversion between the JPA entity used for persistence and the DTO
  * used for JAXB XML marshalling in the Green Button API.
  *
@@ -48,7 +51,6 @@ public interface ApplicationInformationMapper {
      * @param entity the application information entity
      * @return the application information DTO
      */
-    @Mapping(target = "uuid", source = "id", qualifiedByName = "uuidToString")
     // XSD fields in order
     @Mapping(target = "dataCustodianId", source = "dataCustodianId")
     @Mapping(target = "dataCustodianApplicationStatus", source = "dataCustodianApplicationStatus")
@@ -95,36 +97,9 @@ public interface ApplicationInformationMapper {
      * @param dto the application information DTO
      * @return the application information entity
      */
-    @Mapping(target = "id", source = "uuid", qualifiedByName = "stringToUuid")
-    @Mapping(target = "created", ignore = true)
-    @Mapping(target = "published", ignore = true)
-    @Mapping(target = "updated", ignore = true)
-    @Mapping(target = "description", ignore = true)
-    @Mapping(target = "relatedLinks", ignore = true)
-    @Mapping(target = "selfLink", ignore = true)
-    @Mapping(target = "upLink", ignore = true)
     @Mapping(target = "scope", ignore = true) // Complex type conversion needed: String -> Set<String>
     @Mapping(target = "grantTypes", ignore = true) // Complex type conversion needed: String -> Set<GrantType>
     @Mapping(target = "relatedLinkHrefs", ignore = true) // Extension field not in ESPI 4.0 XSD
     ApplicationInformationEntity toEntity(ApplicationInformationDto dto);
 
-    /**
-     * Updates an existing ApplicationInformationEntity with data from an ApplicationInformationDto.
-     * Useful for merge operations where the entity ID should be preserved.
-     *
-     * @param dto the source DTO
-     * @param entity the target entity to update
-     */
-    @Mapping(target = "id", ignore = true)
-    @Mapping(target = "published", ignore = true)
-    @Mapping(target = "updated", ignore = true)
-    @Mapping(target = "created", ignore = true)
-    @Mapping(target = "description", ignore = true)
-    @Mapping(target = "relatedLinks", ignore = true)
-    @Mapping(target = "selfLink", ignore = true)
-    @Mapping(target = "upLink", ignore = true)
-    @Mapping(target = "scope", ignore = true) // Complex type conversion needed: String -> Set<String>
-    @Mapping(target = "grantTypes", ignore = true) // Complex type conversion needed: String -> Set<GrantType>
-    @Mapping(target = "relatedLinkHrefs", ignore = true) // Extension field not in ESPI 4.0 XSD
-    void updateEntity(ApplicationInformationDto dto, @MappingTarget ApplicationInformationEntity entity);
 }
diff --git a/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/mapper/usage/AuthorizationMapper.java b/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/mapper/usage/AuthorizationMapper.java
index 7a837972..d5a6b2df 100644
--- a/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/mapper/usage/AuthorizationMapper.java
+++ b/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/mapper/usage/AuthorizationMapper.java
@@ -29,8 +29,11 @@
 
 /**
  * MapStruct mapper for converting between AuthorizationEntity and AuthorizationDto.
- * 
- * Handles the conversion between the JPA entity used for persistence and the DTO 
+ *
+ * Maps only Authorization fields. IdentifiedObject fields are NOT part of the usage.xsd
+ * definition and are handled by AtomFeedDto/AtomEntryDto.
+ *
+ * Handles the conversion between the JPA entity used for persistence and the DTO
  * used for JAXB XML marshalling in the Green Button API.
  */
 @Mapper(componentModel = "spring", uses = {
@@ -46,7 +49,6 @@ public interface AuthorizationMapper {
      * @param entity the authorization entity
      * @return the authorization DTO
      */
-    @Mapping(target = "uuid", source = "id", qualifiedByName = "uuidToString")
     // XSD-compliant fields
     @Mapping(target = "authorizedPeriod", source = "authorizedPeriod")
     @Mapping(target = "publishedPeriod", source = "publishedPeriod")
@@ -79,11 +81,6 @@ public interface AuthorizationMapper {
      * @param dto the authorization DTO
      * @return the authorization entity
      */
-    @Mapping(target = "id", source = "uuid", qualifiedByName = "stringToUuid")
-    @Mapping(target = "created", ignore = true)
-    @Mapping(target = "published", ignore = true)
-    @Mapping(target = "updated", ignore = true)
-    @Mapping(target = "description", ignore = true)
     // XSD-compliant fields
     @Mapping(target = "authorizedPeriod", source = "authorizedPeriod")
     @Mapping(target = "publishedPeriod", source = "publishedPeriod")
@@ -107,51 +104,7 @@ public interface AuthorizationMapper {
     @Mapping(target = "thirdParty", source = "thirdParty")
     @Mapping(target = "applicationInformation", ignore = true) // Complex mapping, handle separately
     @Mapping(target = "retailCustomer", ignore = true) // Complex mapping, handle separately
-    @Mapping(target = "relatedLinks", ignore = true)
-    @Mapping(target = "selfLink", ignore = true)
-    @Mapping(target = "upLink", ignore = true)
     @Mapping(target = "subscription", ignore = true)
     AuthorizationEntity toEntity(AuthorizationDto dto);
 
-    /**
-     * Updates an existing AuthorizationEntity with data from an AuthorizationDto.
-     * Useful for update operations where the entity ID should be preserved.
-     *
-     * @param dto the source DTO
-     * @param entity the target entity to update
-     */
-    @Mapping(target = "id", ignore = true)
-    @Mapping(target = "published", ignore = true)
-    @Mapping(target = "updated", ignore = true)
-    @Mapping(target = "created", ignore = true)
-    @Mapping(target = "description", ignore = true)
-    // XSD-compliant fields - will be mapped
-    @Mapping(target = "authorizedPeriod", source = "authorizedPeriod")
-    @Mapping(target = "publishedPeriod", source = "publishedPeriod")
-    @Mapping(target = "status", source = "status")
-    @Mapping(target = "expiresIn", source = "expiresIn")
-    @Mapping(target = "grantType", source = "grantType")
-    @Mapping(target = "scope", source = "scope")
-    @Mapping(target = "tokenType", source = "tokenType")
-    @Mapping(target = "error", source = "error")
-    @Mapping(target = "errorDescription", source = "errorDescription")
-    @Mapping(target = "errorUri", source = "errorUri")
-    @Mapping(target = "resourceURI", source = "resourceURI")
-    @Mapping(target = "authorizationURI", source = "authorizationUri")
-    @Mapping(target = "customerResourceURI", source = "customerResourceURI")
-    // OAuth2 implementation fields - will be mapped
-    @Mapping(target = "accessToken", source = "accessToken")
-    @Mapping(target = "refreshToken", source = "refreshToken")
-    @Mapping(target = "code", source = "authorizationCode")
-    @Mapping(target = "state", source = "state")
-    @Mapping(target = "responseType", source = "responseType")
-    @Mapping(target = "thirdParty", source = "thirdParty")
-    // Relationships - preserve existing
-    @Mapping(target = "relatedLinks", ignore = true)
-    @Mapping(target = "selfLink", ignore = true)
-    @Mapping(target = "upLink", ignore = true)
-    @Mapping(target = "retailCustomer", ignore = true)
-    @Mapping(target = "applicationInformation", ignore = true)
-    @Mapping(target = "subscription", ignore = true)
-    void updateEntity(AuthorizationDto dto, @MappingTarget AuthorizationEntity entity);
 }
\ No newline at end of file
diff --git a/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/mapper/usage/ElectricPowerQualitySummaryMapper.java b/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/mapper/usage/ElectricPowerQualitySummaryMapper.java
index c5fe7c21..7c6798f1 100644
--- a/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/mapper/usage/ElectricPowerQualitySummaryMapper.java
+++ b/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/mapper/usage/ElectricPowerQualitySummaryMapper.java
@@ -30,8 +30,11 @@
 
 /**
  * MapStruct mapper for converting between ElectricPowerQualitySummaryEntity and ElectricPowerQualitySummaryDto.
- * 
- * Handles the conversion between the JPA entity used for persistence and the DTO 
+ *
+ * Maps only ElectricPowerQualitySummary fields. IdentifiedObject fields are NOT part of the usage.xsd
+ * definition and are handled by AtomFeedDto/AtomEntryDto.
+ *
+ * Handles the conversion between the JPA entity used for persistence and the DTO
  * used for JAXB XML marshalling in the Green Button API.
  */
 @Mapper(componentModel = "spring", uses = {
@@ -44,47 +47,24 @@ public interface ElectricPowerQualitySummaryMapper {
     /**
      * Converts an ElectricPowerQualitySummaryEntity to an ElectricPowerQualitySummaryDto.
      * Maps power quality metrics and measurement information.
-     * 
+     *
      * @param entity the electric power quality summary entity
      * @return the electric power quality summary DTO
      */
-    @Mapping(target = "id", ignore = true) // DTO id field not used
-    @Mapping(target = "uuid", source = "id", qualifiedByName = "uuidToString")
+    @Mapping(target = "id", ignore = true) // IdentifiedObject field handled by Atom layer
     @Mapping(target = "usagePointId", source = "usagePoint.id", qualifiedByName = "uuidToLong")
     ElectricPowerQualitySummaryDto toDto(ElectricPowerQualitySummaryEntity entity);
 
     /**
      * Converts an ElectricPowerQualitySummaryDto to an ElectricPowerQualitySummaryEntity.
      * Maps power quality metrics and measurement information.
-     * 
+     *
      * @param dto the electric power quality summary DTO
      * @return the electric power quality summary entity
      */
-    @Mapping(target = "id", source = "uuid", qualifiedByName = "stringToUuid")
-    @Mapping(target = "created", ignore = true)
-    @Mapping(target = "updated", ignore = true)
-    @Mapping(target = "published", ignore = true)
-    @Mapping(target = "upLink", ignore = true)
-    @Mapping(target = "selfLink", ignore = true)
-    @Mapping(target = "relatedLinks", ignore = true)
+    @Mapping(target = "id", ignore = true) // IdentifiedObject field handled by Atom layer
     @Mapping(target = "usagePoint", ignore = true) // Relationships handled separately
     @Mapping(target = "upResource", ignore = true)
     ElectricPowerQualitySummaryEntity toEntity(ElectricPowerQualitySummaryDto dto);
 
-    /**
-     * Updates an existing ElectricPowerQualitySummaryEntity with data from an ElectricPowerQualitySummaryDto.
-     * Useful for merge operations where the entity ID should be preserved.
-     * 
-     * @param dto the source DTO
-     * @param entity the target entity to update
-     */
-    @Mapping(target = "id", ignore = true)
-    @Mapping(target = "created", ignore = true)
-    @Mapping(target = "updated", ignore = true)
-    @Mapping(target = "published", ignore = true)
-    @Mapping(target = "upLink", ignore = true)
-    @Mapping(target = "selfLink", ignore = true)
-    @Mapping(target = "relatedLinks", ignore = true)
-    @Mapping(target = "usagePoint", ignore = true)
-    void updateEntity(ElectricPowerQualitySummaryDto dto, @MappingTarget ElectricPowerQualitySummaryEntity entity);
 }
\ No newline at end of file
diff --git a/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/mapper/usage/IntervalBlockMapper.java b/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/mapper/usage/IntervalBlockMapper.java
index 1cd4101d..43a541a7 100644
--- a/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/mapper/usage/IntervalBlockMapper.java
+++ b/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/mapper/usage/IntervalBlockMapper.java
@@ -29,8 +29,11 @@
 
 /**
  * MapStruct mapper for converting between IntervalBlockEntity and IntervalBlockDto.
- * 
- * Handles the conversion between the JPA entity used for persistence and the DTO 
+ *
+ * Maps only IntervalBlock fields. IdentifiedObject fields are NOT part of the usage.xsd
+ * definition and are handled by AtomFeedDto/AtomEntryDto.
+ *
+ * Handles the conversion between the JPA entity used for persistence and the DTO
  * used for JAXB XML marshalling in the Green Button API.
  */
 @Mapper(componentModel = "spring", uses = {
@@ -48,8 +51,7 @@ public interface IntervalBlockMapper {
      * @param entity the interval block entity
      * @return the interval block DTO
      */
-    @Mapping(target = "id", ignore = true) // DTO id field not used (legacy field)
-    @Mapping(target = "uuid", source = "id", qualifiedByName = "uuidToString")
+    @Mapping(target = "id", ignore = true) // IdentifiedObject field handled by Atom layer
     @Mapping(target = "interval", source = "interval")
     @Mapping(target = "intervalReadings", source = "intervalReadings")
     IntervalBlockDto toDto(IntervalBlockEntity entity);
@@ -61,14 +63,7 @@ public interface IntervalBlockMapper {
      * @param dto the interval block DTO
      * @return the interval block entity
      */
-    @Mapping(target = "id", source = "uuid", qualifiedByName = "stringToUuid")
-    @Mapping(target = "created", ignore = true)
-    @Mapping(target = "updated", ignore = true)
-    @Mapping(target = "published", ignore = true)
-    @Mapping(target = "upLink", ignore = true)
-    @Mapping(target = "selfLink", ignore = true)
-    @Mapping(target = "relatedLinks", ignore = true)
-    @Mapping(target = "description", ignore = true)
+    @Mapping(target = "id", ignore = true) // IdentifiedObject field handled by Atom layer
     @Mapping(target = "interval", source = "interval")
     @Mapping(target = "intervalReadings", source = "intervalReadings")
     @Mapping(target = "meterReading", ignore = true) // Relationships handled separately
diff --git a/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/mapper/usage/IntervalReadingMapper.java b/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/mapper/usage/IntervalReadingMapper.java
index f331792a..80191651 100644
--- a/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/mapper/usage/IntervalReadingMapper.java
+++ b/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/mapper/usage/IntervalReadingMapper.java
@@ -58,14 +58,4 @@ public interface IntervalReadingMapper {
     @Mapping(target = "intervalBlock", ignore = true)
     IntervalReadingEntity toEntity(IntervalReadingDto dto);
 
-    /**
-     * Updates an existing IntervalReadingEntity with data from an IntervalReadingDto.
-     * Useful for merge operations where the entity ID should be preserved.
-     *
-     * @param dto the source DTO
-     * @param entity the target entity to update
-     */
-    @Mapping(target = "id", ignore = true)
-    @Mapping(target = "intervalBlock", ignore = true)
-    void updateEntity(IntervalReadingDto dto, @MappingTarget IntervalReadingEntity entity);
 }
\ No newline at end of file
diff --git a/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/mapper/usage/MeterReadingMapper.java b/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/mapper/usage/MeterReadingMapper.java
index 46e39986..6ed6cbce 100644
--- a/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/mapper/usage/MeterReadingMapper.java
+++ b/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/mapper/usage/MeterReadingMapper.java
@@ -29,6 +29,9 @@
 /**
  * MapStruct mapper for converting between MeterReadingEntity and MeterReadingDto.
  *
+ * Maps only MeterReading fields. IdentifiedObject fields are NOT part of the usage.xsd
+ * definition and are handled by AtomFeedDto/AtomEntryDto.
+ *
  * Per ESPI 4.0 specification, MeterReading has NO child elements - only relationships
  * expressed via Atom links. The DTO contains NO fields beyond id/uuid.
  *
@@ -41,12 +44,11 @@ public interface MeterReadingMapper {
     /**
      * Converts a MeterReadingEntity to a MeterReadingDto.
      * Maps all related entities to their corresponding DTOs.
-     * 
+     *
      * @param entity the meter reading entity
      * @return the meter reading DTO
      */
-    @Mapping(target = "id", ignore = true) // DTO id field not used
-    @Mapping(target = "uuid", source = "id", qualifiedByName = "uuidToString")
+    @Mapping(target = "id", ignore = true) // IdentifiedObject field handled by Atom layer
     MeterReadingDto toDto(MeterReadingEntity entity);
 
     /**
@@ -56,14 +58,7 @@ public interface MeterReadingMapper {
      * @param dto the meter reading DTO
      * @return the meter reading entity
      */
-    @Mapping(target = "id", source = "uuid", qualifiedByName = "stringToUuid")
-    @Mapping(target = "created", ignore = true) // Audit field managed by persistence
-    @Mapping(target = "updated", ignore = true) // Audit field managed by persistence
-    @Mapping(target = "published", ignore = true) // Audit field managed by persistence
-    @Mapping(target = "description", ignore = true) // Managed separately
-    @Mapping(target = "selfLink", ignore = true) // Link managed separately
-    @Mapping(target = "upLink", ignore = true) // Link managed separately
-    @Mapping(target = "relatedLinks", ignore = true) // Links managed separately
+    @Mapping(target = "id", ignore = true) // IdentifiedObject field handled by Atom layer
     @Mapping(target = "usagePoint", ignore = true) // Relationship managed separately
     @Mapping(target = "readingType", ignore = true) // Relationship managed separately
     @Mapping(target = "intervalBlocks", ignore = true) // Relationship managed separately
diff --git a/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/mapper/usage/ReadingQualityMapper.java b/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/mapper/usage/ReadingQualityMapper.java
index 10a24864..cf38c7e8 100644
--- a/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/mapper/usage/ReadingQualityMapper.java
+++ b/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/mapper/usage/ReadingQualityMapper.java
@@ -54,14 +54,4 @@ public interface ReadingQualityMapper {
     @Mapping(target = "intervalReading", ignore = true)
     ReadingQualityEntity toEntity(ReadingQualityDto dto);
 
-    /**
-     * Updates an existing ReadingQualityEntity with data from a ReadingQualityDto.
-     * Useful for merge operations where the entity ID should be preserved.
-     *
-     * @param dto the source DTO
-     * @param entity the target entity to update
-     */
-    @Mapping(target = "id", ignore = true)
-    @Mapping(target = "intervalReading", ignore = true)
-    void updateEntity(ReadingQualityDto dto, @MappingTarget ReadingQualityEntity entity);
 }
\ No newline at end of file
diff --git a/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/mapper/usage/ReadingTypeMapper.java b/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/mapper/usage/ReadingTypeMapper.java
index e8c6bae8..f927e5d5 100644
--- a/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/mapper/usage/ReadingTypeMapper.java
+++ b/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/mapper/usage/ReadingTypeMapper.java
@@ -21,7 +21,6 @@
 
 import org.greenbuttonalliance.espi.common.domain.usage.ReadingTypeEntity;
 import org.greenbuttonalliance.espi.common.dto.usage.ReadingTypeDto;
-import org.greenbuttonalliance.espi.common.mapper.BaseIdentifiedObjectMapper;
 import org.greenbuttonalliance.espi.common.mapper.BaseMapperUtils;
 import org.greenbuttonalliance.espi.common.mapper.DateTimeMapper;
 import org.mapstruct.Mapper;
@@ -30,9 +29,12 @@
 
 /**
  * MapStruct mapper for converting between ReadingTypeEntity and ReadingTypeDto.
- * 
- * Handles the conversion between the JPA entity used for persistence and the DTO 
+ * <p>
+ * Handles the conversion between the JPA entity used for persistence and the DTO
  * used for JAXB XML marshalling in the Green Button API.
+ * <p>
+ * Maps only espi.xsd ReadingType fields. IdentifiedObject fields are NOT part of
+ * the espi.xsd ReadingType definition and are handled by AtomFeedDto/AtomEntryDto.
  */
 @Mapper(componentModel = "spring", uses = {
     DateTimeMapper.class,
@@ -42,35 +44,24 @@ public interface ReadingTypeMapper {
 
     /**
      * Converts a ReadingTypeEntity to a ReadingTypeDto.
-     * Maps all properties including complex reading type specifications.
-     * 
+     * Maps only espi.xsd ReadingType fields including complex reading type specifications.
+     *
      * @param entity the reading type entity
      * @return the reading type DTO
      */
-    @Mapping(target = "id", ignore = true) // DTO id field not used
-    @Mapping(target = "uuid", source = "id", qualifiedByName = "uuidToString")
-    @Mapping(target = "argument", source = "argument") // Both DTO and Entity use 'argument' field name
+    @Mapping(target = "id", ignore = true) // IdentifiedObject field handled by Atom layer
+    @Mapping(target = "argument", source = "argument")
     ReadingTypeDto toDto(ReadingTypeEntity entity);
 
     /**
      * Converts a ReadingTypeDto to a ReadingTypeEntity.
-     * Maps all properties including complex reading type specifications.
-     * 
+     * Maps only espi.xsd ReadingType fields including complex reading type specifications.
+     *
      * @param dto the reading type DTO
      * @return the reading type entity
      */
-    @Mapping(target = "id", source = "uuid", qualifiedByName = "stringToUuid")
-    @Mapping(target = "argument", source = "argument") // Both DTO and Entity use 'argument' field name
+    @Mapping(target = "id", ignore = true) // IdentifiedObject field handled by Atom layer
+    @Mapping(target = "argument", source = "argument")
     ReadingTypeEntity toEntity(ReadingTypeDto dto);
 
-    /**
-     * Updates an existing ReadingTypeEntity with data from a ReadingTypeDto.
-     * Useful for merge operations where the entity ID should be preserved.
-     * 
-     * @param dto the source DTO
-     * @param entity the target entity to update
-     */
-    @Mapping(target = "id", ignore = true)
-    @Mapping(target = "argument", source = "argument") // Both DTO and Entity use 'argument' field name
-    void updateEntity(ReadingTypeDto dto, @MappingTarget ReadingTypeEntity entity);
-}
\ No newline at end of file
+}
diff --git a/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/mapper/usage/TimeConfigurationMapper.java b/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/mapper/usage/TimeConfigurationMapper.java
index 1157370c..7540ddc3 100644
--- a/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/mapper/usage/TimeConfigurationMapper.java
+++ b/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/mapper/usage/TimeConfigurationMapper.java
@@ -29,6 +29,9 @@
 /**
  * MapStruct mapper for converting between TimeConfigurationEntity and TimeConfigurationDto.
  *
+ * Maps only TimeConfiguration fields. IdentifiedObject fields are NOT part of the usage.xsd
+ * definition and are handled by AtomFeedDto/AtomEntryDto.
+ *
  * Handles the conversion between the JPA entity used for persistence and the DTO
  * used for JAXB XML marshalling in the Green Button API.
  *
@@ -46,8 +49,7 @@ public interface TimeConfigurationMapper extends BaseIdentifiedObjectMapper {
      * @param entity the time configuration entity
      * @return the time configuration DTO
      */
-    @Mapping(target = "id", ignore = true) // DTO id field not used
-    @Mapping(target = "uuid", source = "id") // Map entity ID to DTO uuid for XML mRID
+    @Mapping(target = "id", ignore = true) // IdentifiedObject field handled by Atom layer
     TimeConfigurationDto toDto(TimeConfigurationEntity entity);
 
     /**
@@ -58,37 +60,9 @@ public interface TimeConfigurationMapper extends BaseIdentifiedObjectMapper {
      * @param dto the time configuration DTO
      * @return the time configuration entity
      */
-    @Mapping(target = "id", ignore = true) // ID set by persistence layer
+    @Mapping(target = "id", ignore = true) // IdentifiedObject field handled by Atom layer
     @Mapping(target = "usagePoints", ignore = true) // Collection managed separately
     @Mapping(target = "customer", ignore = true) // Relationship managed separately
-    @Mapping(target = "created", ignore = true) // Audit field managed by persistence
-    @Mapping(target = "updated", ignore = true) // Audit field managed by persistence
-    @Mapping(target = "published", ignore = true) // Audit field managed by persistence
-    @Mapping(target = "selfLink", ignore = true) // Link managed separately
-    @Mapping(target = "upLink", ignore = true) // Link managed separately
-    @Mapping(target = "relatedLinks", ignore = true) // Links managed separately
-    @Mapping(target = "description", ignore = true) // Generated dynamically by entity
     TimeConfigurationEntity toEntity(TimeConfigurationDto dto);
 
-    /**
-     * Updates an existing TimeConfigurationEntity with data from a TimeConfigurationDto.
-     * Useful for merge operations where entity values need to be updated without
-     * creating a new instance.
-     *
-     * Preserves existing relationships and audit fields while updating time configuration data.
-     *
-     * @param dto the source DTO
-     * @param entity the target entity to update
-     */
-    @Mapping(target = "id", ignore = true) // Never update ID
-    @Mapping(target = "usagePoints", ignore = true) // Preserve existing collection
-    @Mapping(target = "customer", ignore = true) // Preserve existing relationship
-    @Mapping(target = "created", ignore = true) // Preserve audit field
-    @Mapping(target = "updated", ignore = true) // Will be updated by persistence layer
-    @Mapping(target = "published", ignore = true) // Preserve audit field
-    @Mapping(target = "selfLink", ignore = true) // Preserve existing link
-    @Mapping(target = "upLink", ignore = true) // Preserve existing link
-    @Mapping(target = "relatedLinks", ignore = true) // Preserve existing links
-    @Mapping(target = "description", ignore = true) // Generated dynamically by entity
-    void updateEntity(TimeConfigurationDto dto, @MappingTarget TimeConfigurationEntity entity);
 }
diff --git a/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/mapper/usage/UsagePointMapper.java b/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/mapper/usage/UsagePointMapper.java
index fbfd4f1e..75785af7 100644
--- a/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/mapper/usage/UsagePointMapper.java
+++ b/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/mapper/usage/UsagePointMapper.java
@@ -21,7 +21,6 @@
 
 import org.greenbuttonalliance.espi.common.domain.usage.UsagePointEntity;
 import org.greenbuttonalliance.espi.common.dto.usage.UsagePointDto;
-import org.greenbuttonalliance.espi.common.mapper.BaseIdentifiedObjectMapper;
 import org.greenbuttonalliance.espi.common.mapper.BaseMapperUtils;
 import org.greenbuttonalliance.espi.common.mapper.DateTimeMapper;
 import org.mapstruct.Mapper;
@@ -30,9 +29,12 @@
 
 /**
  * MapStruct mapper for converting between UsagePointEntity and UsagePointDto.
- * 
- * Handles the conversion between the JPA entity used for persistence and the DTO 
+ * <p>
+ * Handles the conversion between the JPA entity used for persistence and the DTO
  * used for JAXB XML marshalling in the Green Button API.
+ * <p>
+ * Phase 16d: Updated to map all ESPI 4.0 XSD UsagePoint fields including enums and extension fields.
+ * IdentifiedObject fields are NOT part of the espi.xsd UsagePoint definition and are handled by AtomFeedDto/AtomEntryDto.
  */
 @Mapper(componentModel = "spring", uses = {
     DateTimeMapper.class,
@@ -48,90 +50,77 @@ public interface UsagePointMapper {
 
     /**
      * Converts a UsagePointEntity to a UsagePointDto.
-     * Maps all related entities to their corresponding DTOs.
-     * 
+     * Maps only ESPI 4.0 XSD UsagePoint fields (enums, booleans, strings, SummaryMeasurements).
+     *
      * @param entity the usage point entity
      * @return the usage point DTO
      */
-    @Mapping(target = "uuid", source = "id", qualifiedByName = "uuidToString")
-    @Mapping(target = "description", source = "description")
     @Mapping(target = "roleFlags", source = "roleFlags")
     @Mapping(target = "serviceCategory", source = "serviceCategory")
     @Mapping(target = "status", source = "status")
+    @Mapping(target = "serviceDeliveryPoint", source = "serviceDeliveryPoint")
+    @Mapping(target = "amiBillingReady", source = "amiBillingReady")
+    @Mapping(target = "checkBilling", source = "checkBilling")
+    @Mapping(target = "connectionState", source = "connectionState")
     @Mapping(target = "estimatedLoad", source = "estimatedLoad")
+    @Mapping(target = "grounded", source = "grounded")
+    @Mapping(target = "isSdp", source = "isSdp")
+    @Mapping(target = "isVirtual", source = "isVirtual")
+    @Mapping(target = "minimalUsageExpected", source = "minimalUsageExpected")
     @Mapping(target = "nominalServiceVoltage", source = "nominalServiceVoltage")
+    @Mapping(target = "outageRegion", source = "outageRegion")
+    @Mapping(target = "phaseCode", source = "phaseCode")
     @Mapping(target = "ratedCurrent", source = "ratedCurrent")
     @Mapping(target = "ratedPower", source = "ratedPower")
-    @Mapping(target = "serviceDeliveryPoint", source = "serviceDeliveryPoint")
+    @Mapping(target = "readCycle", source = "readCycle")
+    @Mapping(target = "readRoute", source = "readRoute")
+    @Mapping(target = "serviceDeliveryRemark", source = "serviceDeliveryRemark")
+    @Mapping(target = "servicePriority", source = "servicePriority")
     @Mapping(target = "pnodeRefs", ignore = true) // TODO: Add mapper implementation
     @Mapping(target = "aggregatedNodeRefs", ignore = true) // TODO: Add mapper implementation
     @Mapping(target = "meterReadings", ignore = true) // Circular dependency - handle separately
-    @Mapping(target = "usageSummaries", ignore = true) // Circular dependency - handle separately  
+    @Mapping(target = "usageSummaries", ignore = true) // Circular dependency - handle separately
     @Mapping(target = "electricPowerQualitySummaries", ignore = true) // Circular dependency - handle separately
     UsagePointDto toDto(UsagePointEntity entity);
 
     /**
      * Converts a UsagePointDto to a UsagePointEntity.
-     * Maps all related DTOs to their corresponding entities.
-     * 
+     * Maps only ESPI 4.0 XSD UsagePoint fields (enums, booleans, strings, SummaryMeasurements).
+     *
      * @param dto the usage point DTO
      * @return the usage point entity
      */
-    @Mapping(target = "id", source = "uuid", qualifiedByName = "stringToUuid")
-    @Mapping(target = "created", ignore = true)
-    @Mapping(target = "published", ignore = true)
-    @Mapping(target = "updated", ignore = true)
-    @Mapping(target = "description", source = "description")
     @Mapping(target = "roleFlags", source = "roleFlags")
     @Mapping(target = "serviceCategory", source = "serviceCategory")
     @Mapping(target = "status", source = "status")
+    @Mapping(target = "serviceDeliveryPoint", source = "serviceDeliveryPoint")
+    @Mapping(target = "amiBillingReady", source = "amiBillingReady")
+    @Mapping(target = "checkBilling", source = "checkBilling")
+    @Mapping(target = "connectionState", source = "connectionState")
     @Mapping(target = "estimatedLoad", source = "estimatedLoad")
+    @Mapping(target = "grounded", source = "grounded")
+    @Mapping(target = "isSdp", source = "isSdp")
+    @Mapping(target = "isVirtual", source = "isVirtual")
+    @Mapping(target = "minimalUsageExpected", source = "minimalUsageExpected")
     @Mapping(target = "nominalServiceVoltage", source = "nominalServiceVoltage")
+    @Mapping(target = "outageRegion", source = "outageRegion")
+    @Mapping(target = "phaseCode", source = "phaseCode")
     @Mapping(target = "ratedCurrent", source = "ratedCurrent")
     @Mapping(target = "ratedPower", source = "ratedPower")
-    @Mapping(target = "serviceDeliveryPoint", source = "serviceDeliveryPoint")
-    @Mapping(target = "uri", ignore = true)
+    @Mapping(target = "readCycle", source = "readCycle")
+    @Mapping(target = "readRoute", source = "readRoute")
+    @Mapping(target = "serviceDeliveryRemark", source = "serviceDeliveryRemark")
+    @Mapping(target = "servicePriority", source = "servicePriority")
+    @Mapping(target = "uri", ignore = true) // Legacy field
     @Mapping(target = "pnodeRefs", ignore = true) // TODO: Add mapper implementation
     @Mapping(target = "aggregatedNodeRefs", ignore = true) // TODO: Add mapper implementation
     @Mapping(target = "meterReadings", ignore = true) // Circular dependency - handle separately
     @Mapping(target = "usageSummaries", ignore = true) // Circular dependency - handle separately
     @Mapping(target = "electricPowerQualitySummaries", ignore = true) // Circular dependency - handle separately
-    @Mapping(target = "relatedLinks", ignore = true)
-    @Mapping(target = "selfLink", ignore = true)
-    @Mapping(target = "upLink", ignore = true)
-    @Mapping(target = "retailCustomer", ignore = true)
-    @Mapping(target = "localTimeParameters", ignore = true)
-    @Mapping(target = "subscriptions", ignore = true)
-    @Mapping(target = "subscription", ignore = true)
+    @Mapping(target = "retailCustomer", ignore = true) // Relationship - handled separately
+    @Mapping(target = "localTimeParameters", ignore = true) // Relationship - handled separately
+    @Mapping(target = "subscriptions", ignore = true) // Relationship - handled separately
+    @Mapping(target = "subscription", ignore = true) // Relationship - handled separately
     UsagePointEntity toEntity(UsagePointDto dto);
 
-    /**
-     * Updates an existing UsagePointEntity with data from a UsagePointDto.
-     * Useful for merge operations where the entity ID should be preserved.
-     * 
-     * @param dto the source DTO
-     * @param entity the target entity to update
-     */
-    @Mapping(target = "id", ignore = true)
-    @Mapping(target = "published", ignore = true) // Managed by entity lifecycle
-    @Mapping(target = "updated", ignore = true) // Managed by entity lifecycle
-    @Mapping(target = "created", ignore = true) // Inherited from IdentifiedObject
-    @Mapping(target = "estimatedLoad", source = "estimatedLoad")
-    @Mapping(target = "nominalServiceVoltage", source = "nominalServiceVoltage")
-    @Mapping(target = "ratedCurrent", source = "ratedCurrent")
-    @Mapping(target = "ratedPower", source = "ratedPower")
-    @Mapping(target = "uri", ignore = true) // Managed separately
-    @Mapping(target = "pnodeRefs", ignore = true) // Object type - ignore for now
-    @Mapping(target = "aggregatedNodeRefs", ignore = true) // Object type - ignore for now
-    @Mapping(target = "meterReadings", ignore = true) // Object type - ignore for now
-    @Mapping(target = "usageSummaries", ignore = true) // Object type - ignore for now
-    @Mapping(target = "electricPowerQualitySummaries", ignore = true) // Object type - ignore for now
-    @Mapping(target = "relatedLinks", ignore = true)
-    @Mapping(target = "selfLink", ignore = true)
-    @Mapping(target = "upLink", ignore = true)
-    @Mapping(target = "retailCustomer", ignore = true)
-    @Mapping(target = "localTimeParameters", ignore = true)
-    @Mapping(target = "subscriptions", ignore = true)
-    @Mapping(target = "subscription", ignore = true)
-    void updateEntity(UsagePointDto dto, @MappingTarget UsagePointEntity entity);
-}
\ No newline at end of file
+}
diff --git a/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/mapper/usage/UsageSummaryMapper.java b/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/mapper/usage/UsageSummaryMapper.java
index 2842a1d8..96c8e1eb 100644
--- a/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/mapper/usage/UsageSummaryMapper.java
+++ b/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/mapper/usage/UsageSummaryMapper.java
@@ -31,9 +31,12 @@
 
 /**
  * MapStruct mapper for converting between UsageSummaryEntity and UsageSummaryDto.
- * 
- * Handles the conversion between the JPA entity used for persistence and the DTO 
+ * <p>
+ * Handles the conversion between the JPA entity used for persistence and the DTO
  * used for JAXB XML marshalling in the Green Button API.
+ * <p>
+ * Maps only ESPI 4.0 XSD UsageSummary fields. IdentifiedObject fields are NOT part of
+ * the espi.xsd UsageSummary definition and are handled by AtomFeedDto/AtomEntryDto.
  */
 @Mapper(componentModel = "spring", uses = {
     DateTimeMapper.class,
@@ -47,20 +50,12 @@ public interface UsageSummaryMapper {
 
     /**
      * Converts a UsageSummaryEntity to a UsageSummaryDto.
-     * Maps usage summary data including billing period, cost information, consumption summaries,
-     * and tariff details per ESPI 4.0 specification.
+     * Maps only ESPI 4.0 XSD UsageSummary fields (billing period, cost information, consumption summaries, tariff details).
      *
      * @param entity the usage summary entity
      * @return the usage summary DTO
      */
-    @Mapping(target = "id", ignore = true) // DTO id field not used
-    @Mapping(target = "uuid", source = "id", qualifiedByName = "uuidToString")
-    @Mapping(target = "published", source = "published", qualifiedByName = "localToOffset")
-    @Mapping(target = "updated", source = "updated", qualifiedByName = "localToOffset")
-    @Mapping(target = "relatedLinks", ignore = true) // Links handled separately
-    @Mapping(target = "selfLink", ignore = true)
-    @Mapping(target = "upLink", ignore = true)
-    @Mapping(target = "description", source = "description")
+    @Mapping(target = "id", ignore = true) // IdentifiedObject field handled by Atom layer
     @Mapping(target = "billingPeriod", source = "billingPeriod")
     @Mapping(target = "billLastPeriod", source = "billLastPeriod")
     @Mapping(target = "billToDate", source = "billToDate")
@@ -89,16 +84,12 @@ public interface UsageSummaryMapper {
 
     /**
      * Converts a UsageSummaryDto to a UsageSummaryEntity.
-     * Maps usage summary data including billing period, cost information, consumption summaries,
-     * and tariff details per ESPI 4.0 specification.
+     * Maps only ESPI 4.0 XSD UsageSummary fields (billing period, cost information, consumption summaries, tariff details).
      *
      * @param dto the usage summary DTO
      * @return the usage summary entity
      */
-    @Mapping(target = "id", source = "uuid", qualifiedByName = "stringToUuid")
-    @Mapping(target = "published", source = "published", qualifiedByName = "offsetToLocal")
-    @Mapping(target = "updated", source = "updated", qualifiedByName = "offsetToLocal")
-    @Mapping(target = "description", source = "description")
+    @Mapping(target = "id", ignore = true) // IdentifiedObject field handled by Atom layer
     @Mapping(target = "billingPeriod", source = "billingPeriod")
     @Mapping(target = "billLastPeriod", source = "billLastPeriod")
     @Mapping(target = "billToDate", source = "billToDate")
@@ -124,52 +115,6 @@ public interface UsageSummaryMapper {
     @Mapping(target = "tariffRiderRefs", source = "tariffRiderRefs", qualifiedByName = "tariffRiderRefsDtoToEntityList")
     @Mapping(target = "billingChargeSource", source = "billingChargeSource")
     @Mapping(target = "usagePoint", ignore = true) // Relationship handled separately
-    @Mapping(target = "created", ignore = true) // Inherited from IdentifiedObject
-    @Mapping(target = "relatedLinks", ignore = true)
-    @Mapping(target = "selfLink", ignore = true)
-    @Mapping(target = "upLink", ignore = true)
     UsageSummaryEntity toEntity(UsageSummaryDto dto);
 
-    /**
-     * Updates an existing UsageSummaryEntity with data from a UsageSummaryDto.
-     * Useful for merge operations where the entity ID should be preserved.
-     * Maps all ESPI 4.0 fields while preserving entity identity and relationships.
-     *
-     * @param dto the source DTO
-     * @param entity the target entity to update
-     */
-    @Mapping(target = "id", ignore = true)
-    @Mapping(target = "published", source = "published", qualifiedByName = "offsetToLocal")
-    @Mapping(target = "updated", source = "updated", qualifiedByName = "offsetToLocal")
-    @Mapping(target = "description", source = "description")
-    @Mapping(target = "billingPeriod", source = "billingPeriod")
-    @Mapping(target = "billLastPeriod", source = "billLastPeriod")
-    @Mapping(target = "billToDate", source = "billToDate")
-    @Mapping(target = "costAdditionalLastPeriod", source = "costAdditionalLastPeriod")
-    @Mapping(target = "costAdditionalDetailLastPeriod", source = "costAdditionalDetailLastPeriod")
-    @Mapping(target = "currency", source = "currency")
-    @Mapping(target = "overallConsumptionLastPeriod", source = "overallConsumptionLastPeriod")
-    @Mapping(target = "currentBillingPeriodOverAllConsumption", source = "currentBillingPeriodOverAllConsumption")
-    @Mapping(target = "currentDayLastYearNetConsumption", source = "currentDayLastYearNetConsumption")
-    @Mapping(target = "currentDayNetConsumption", source = "currentDayNetConsumption")
-    @Mapping(target = "currentDayOverallConsumption", source = "currentDayOverallConsumption")
-    @Mapping(target = "peakDemand", source = "peakDemand")
-    @Mapping(target = "previousDayLastYearOverallConsumption", source = "previousDayLastYearOverallConsumption")
-    @Mapping(target = "previousDayNetConsumption", source = "previousDayNetConsumption")
-    @Mapping(target = "previousDayOverallConsumption", source = "previousDayOverallConsumption")
-    @Mapping(target = "qualityOfReading", source = "qualityOfReading")
-    @Mapping(target = "ratchetDemand", source = "ratchetDemand")
-    @Mapping(target = "ratchetDemandPeriod", source = "ratchetDemandPeriod")
-    @Mapping(target = "statusTimeStamp", source = "statusTimeStamp")
-    @Mapping(target = "commodity", source = "commodity")
-    @Mapping(target = "tariffProfile", source = "tariffProfile")
-    @Mapping(target = "readCycle", source = "readCycle")
-    @Mapping(target = "tariffRiderRefs", source = "tariffRiderRefs", qualifiedByName = "tariffRiderRefsDtoToEntityList")
-    @Mapping(target = "billingChargeSource", source = "billingChargeSource")
-    @Mapping(target = "usagePoint", ignore = true) // Relationship handled separately
-    @Mapping(target = "created", ignore = true) // Inherited from IdentifiedObject
-    @Mapping(target = "relatedLinks", ignore = true)
-    @Mapping(target = "selfLink", ignore = true)
-    @Mapping(target = "upLink", ignore = true)
-    void updateEntity(UsageSummaryDto dto, @MappingTarget UsageSummaryEntity entity);
 }
\ No newline at end of file
diff --git a/openespi-common/src/test/java/org/greenbuttonalliance/espi/common/Jackson3XmlMarshallingTest.java b/openespi-common/src/test/java/org/greenbuttonalliance/espi/common/Jackson3XmlMarshallingTest.java
index e9aaf0a8..6ee7eab8 100644
--- a/openespi-common/src/test/java/org/greenbuttonalliance/espi/common/Jackson3XmlMarshallingTest.java
+++ b/openespi-common/src/test/java/org/greenbuttonalliance/espi/common/Jackson3XmlMarshallingTest.java
@@ -20,6 +20,7 @@
 package org.greenbuttonalliance.espi.common;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import org.greenbuttonalliance.espi.common.dto.atom.AtomEntryDto;
 import org.greenbuttonalliance.espi.common.dto.usage.UsagePointDto;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
@@ -72,22 +73,27 @@ void shouldMarshalUsagePointWithRealisticData() throws Exception {
         // Create a UsagePointDto with realistic ESPI data
         UsagePointDto usagePoint = new UsagePointDto(
             "urn:uuid:test-usage-point",
-            "Residential Electric Service",
             new byte[]{0x01, 0x04}, // Electricity consumer role flags
             null, // serviceCategory
             (short) 1, // Active status
-            null, null, null, null, // measurement fields
-            null, null, null, // reference fields
-            null, null, null // collection fields
+            null, null, null, null, null, // serviceDeliveryPoint, amiBillingReady, checkBilling, connectionState, estimatedLoad
+            null, null, null, null, // grounded, isSdp, isVirtual, minimalUsageExpected
+            null, null, null, null, null, // nominalServiceVoltage, outageRegion, phaseCode, ratedCurrent, ratedPower
+            null, null, null, null, // readCycle, readRoute, serviceDeliveryRemark, servicePriority
+            null, null, null, null, null // pnodeRefs, aggregatedNodeRefs, meterReadings, usageSummaries, electricPowerQualitySummaries
         );
 
+        // Wrap in Atom entry with description as title (IdentifiedObject fields handled by Atom layer)
+        AtomEntryDto entry = new AtomEntryDto("urn:uuid:test-usage-point", "Residential Electric Service", usagePoint);
+
         // Marshal to XML using Jackson 3
-        String xml = xmlMapper.writeValueAsString(usagePoint);
+        String xml = xmlMapper.writeValueAsString(entry);
 
         // Verify XML structure
+        assertThat(xml).contains("entry"); // Now wrapping in Atom entry
         assertThat(xml).contains("UsagePoint");
         assertThat(xml).contains("http://naesb.org/espi");
-        assertThat(xml).contains("Residential Electric Service");
+        assertThat(xml).contains("Residential Electric Service"); // In Atom title
         assertThat(xml).containsPattern("<status[^>]*>1</status>"); // May have xmlns attribute
     }
 
@@ -95,27 +101,32 @@ void shouldMarshalUsagePointWithRealisticData() throws Exception {
     @DisplayName("Should perform round-trip marshalling for UsagePointDto")
     void shouldPerformRoundTripMarshallingForUsagePoint() throws Exception {
         // Create original UsagePoint with comprehensive data
-        UsagePointDto original = new UsagePointDto(
+        UsagePointDto originalUsagePoint = new UsagePointDto(
             "urn:uuid:commercial-gas-point",
-            "Commercial Gas Service",
             new byte[]{0x02, 0x08}, // Gas consumer role flags
             null, // serviceCategory
             (short) 1, // Active status
-            null, null, null, null, // measurement fields
-            null, null, null, // reference fields
-            null, null, null // collection fields
+            null, null, null, null, null, // serviceDeliveryPoint, amiBillingReady, checkBilling, connectionState, estimatedLoad
+            null, null, null, null, // grounded, isSdp, isVirtual, minimalUsageExpected
+            null, null, null, null, null, // nominalServiceVoltage, outageRegion, phaseCode, ratedCurrent, ratedPower
+            null, null, null, null, // readCycle, readRoute, serviceDeliveryRemark, servicePriority
+            null, null, null, null, null // pnodeRefs, aggregatedNodeRefs, meterReadings, usageSummaries, electricPowerQualitySummaries
         );
 
+        // Wrap in Atom entry with description as title (IdentifiedObject fields handled by Atom layer)
+        AtomEntryDto originalEntry = new AtomEntryDto("urn:uuid:commercial-gas-point", "Commercial Gas Service", originalUsagePoint);
+
         // Marshal to XML using Jackson 3
-        String xml = xmlMapper.writeValueAsString(original);
+        String xml = xmlMapper.writeValueAsString(originalEntry);
 
         // Unmarshal back from XML using Jackson 3
-        UsagePointDto roundTrip = xmlMapper.readValue(xml, UsagePointDto.class);
+        AtomEntryDto roundTripEntry = xmlMapper.readValue(xml, AtomEntryDto.class);
 
         // Verify data integrity survived round trip
-        assertThat(roundTrip.description()).isEqualTo(original.description());
-        assertThat(roundTrip.status()).isEqualTo(original.status());
-        assertThat(roundTrip.roleFlags()).isEqualTo(original.roleFlags());
+        assertThat(roundTripEntry.title()).isEqualTo(originalEntry.title()); // Description is in Atom title
+        UsagePointDto roundTripUsagePoint = (UsagePointDto) roundTripEntry.content();
+        assertThat(roundTripUsagePoint.status()).isEqualTo(originalUsagePoint.status());
+        assertThat(roundTripUsagePoint.roleFlags()).isEqualTo(originalUsagePoint.roleFlags());
     }
 
     @Test
@@ -123,24 +134,34 @@ void shouldPerformRoundTripMarshallingForUsagePoint() throws Exception {
     void shouldHandleEmptyUsagePointWithoutErrors() throws Exception {
         // Create empty UsagePoint
         UsagePointDto empty = new UsagePointDto(
-            null, null, null, null, null,
-            null, null, null, null,
-            null, null, null,
-            null, null, null
+            null, // uuid
+            null, // roleFlags
+            null, // serviceCategory
+            null, // status
+            null, null, null, null, null, // serviceDeliveryPoint, amiBillingReady, checkBilling, connectionState, estimatedLoad
+            null, null, null, null, // grounded, isSdp, isVirtual, minimalUsageExpected
+            null, null, null, null, null, // nominalServiceVoltage, outageRegion, phaseCode, ratedCurrent, ratedPower
+            null, null, null, null, // readCycle, readRoute, serviceDeliveryRemark, servicePriority
+            null, null, null, null, null // pnodeRefs, aggregatedNodeRefs, meterReadings, usageSummaries, electricPowerQualitySummaries
         );
 
+        // Wrap in Atom entry (IdentifiedObject fields handled by Atom layer)
+        AtomEntryDto entry = new AtomEntryDto(null, null, empty);
+
         // Marshal to XML using Jackson 3
-        String xml = xmlMapper.writeValueAsString(empty);
+        String xml = xmlMapper.writeValueAsString(entry);
 
         // Should still contain basic structure
+        assertThat(xml).contains("entry");
         assertThat(xml).contains("UsagePoint");
         assertThat(xml).contains("http://naesb.org/espi");
 
         // Unmarshal back using Jackson 3
-        UsagePointDto roundTrip = xmlMapper.readValue(xml, UsagePointDto.class);
+        AtomEntryDto roundTripEntry = xmlMapper.readValue(xml, AtomEntryDto.class);
 
         // Should not throw exceptions
-        assertThat(roundTrip).isNotNull();
+        assertThat(roundTripEntry).isNotNull();
+        assertThat(roundTripEntry.content()).isNotNull();
     }
 
     @Test
@@ -149,23 +170,28 @@ void shouldHandleNullValuesGracefully() throws Exception {
         // Create UsagePoint with some null values
         UsagePointDto withNulls = new UsagePointDto(
             "urn:uuid:test-nulls",
-            null, // Null description
             null, // Null role flags
             null, // serviceCategory
             (short) 1, // Non-null status
-            null, null, null, null, // measurement fields
-            null, null, null, // reference fields
-            null, null, null // collection fields
+            null, null, null, null, null, // serviceDeliveryPoint, amiBillingReady, checkBilling, connectionState, estimatedLoad
+            null, null, null, null, // grounded, isSdp, isVirtual, minimalUsageExpected
+            null, null, null, null, null, // nominalServiceVoltage, outageRegion, phaseCode, ratedCurrent, ratedPower
+            null, null, null, null, // readCycle, readRoute, serviceDeliveryRemark, servicePriority
+            null, null, null, null, null // pnodeRefs, aggregatedNodeRefs, meterReadings, usageSummaries, electricPowerQualitySummaries
         );
 
+        // Wrap in Atom entry with null description/title (IdentifiedObject fields handled by Atom layer)
+        AtomEntryDto entry = new AtomEntryDto("urn:uuid:test-nulls", null, withNulls);
+
         // Marshal to XML using Jackson 3
-        String xml = xmlMapper.writeValueAsString(withNulls);
+        String xml = xmlMapper.writeValueAsString(entry);
 
         // Unmarshal back using Jackson 3
-        UsagePointDto roundTrip = xmlMapper.readValue(xml, UsagePointDto.class);
+        AtomEntryDto roundTripEntry = xmlMapper.readValue(xml, AtomEntryDto.class);
 
         // Verify nulls are preserved
-        assertThat(roundTrip.description()).isNull();
+        assertThat(roundTripEntry.title()).isNull(); // Null description is in Atom title
+        UsagePointDto roundTrip = (UsagePointDto) roundTripEntry.content();
         assertThat(roundTrip.roleFlags()).isNull();
         assertThat(roundTrip.status()).isEqualTo(withNulls.status());
     }
@@ -176,19 +202,26 @@ void shouldIncludeProperXmlNamespaces() throws Exception {
         // Create UsagePoint
         UsagePointDto usagePoint = new UsagePointDto(
             "urn:uuid:test-namespaces",
-            "Test Service",
-            null, null, null,
-            null, null, null, null,
-            null, null, null,
-            null, null, null
+            null, // roleFlags
+            null, // serviceCategory
+            null, // status
+            null, null, null, null, null, // serviceDeliveryPoint, amiBillingReady, checkBilling, connectionState, estimatedLoad
+            null, null, null, null, // grounded, isSdp, isVirtual, minimalUsageExpected
+            null, null, null, null, null, // nominalServiceVoltage, outageRegion, phaseCode, ratedCurrent, ratedPower
+            null, null, null, null, // readCycle, readRoute, serviceDeliveryRemark, servicePriority
+            null, null, null, null, null // pnodeRefs, aggregatedNodeRefs, meterReadings, usageSummaries, electricPowerQualitySummaries
         );
 
+        // Wrap in Atom entry with description as title (IdentifiedObject fields handled by Atom layer)
+        AtomEntryDto entry = new AtomEntryDto("urn:uuid:test-namespaces", "Test Service", usagePoint);
+
         // Marshal to XML using Jackson 3
-        String xml = xmlMapper.writeValueAsString(usagePoint);
+        String xml = xmlMapper.writeValueAsString(entry);
 
         // Verify namespace declarations
         assertThat(xml).contains("xmlns");
         assertThat(xml).contains("http://naesb.org/espi");
+        assertThat(xml).contains("http://www.w3.org/2005/Atom"); // Atom namespace
 
         // Verify no legacy namespaces
         assertThat(xml).doesNotContain("legacy");
@@ -198,18 +231,24 @@ void shouldIncludeProperXmlNamespaces() throws Exception {
     @Test
     @DisplayName("Should marshal special characters correctly")
     void shouldMarshalSpecialCharactersCorrectly() throws Exception {
-        // Create UsagePoint with special characters
+        // Create UsagePoint with special characters in description (will be in Atom title)
         UsagePointDto usagePoint = new UsagePointDto(
             "urn:uuid:test-special-chars",
-            "Service & Co. <Electric> \"Smart\" Meter",
-            null, null, null,
-            null, null, null, null,
-            null, null, null,
-            null, null, null
+            null, // roleFlags
+            null, // serviceCategory
+            null, // status
+            null, null, null, null, null, // serviceDeliveryPoint, amiBillingReady, checkBilling, connectionState, estimatedLoad
+            null, null, null, null, // grounded, isSdp, isVirtual, minimalUsageExpected
+            null, null, null, null, null, // nominalServiceVoltage, outageRegion, phaseCode, ratedCurrent, ratedPower
+            null, null, null, null, // readCycle, readRoute, serviceDeliveryRemark, servicePriority
+            null, null, null, null, null // pnodeRefs, aggregatedNodeRefs, meterReadings, usageSummaries, electricPowerQualitySummaries
         );
 
+        // Wrap in Atom entry with special characters in title (IdentifiedObject fields handled by Atom layer)
+        AtomEntryDto entry = new AtomEntryDto("urn:uuid:test-special-chars", "Service & Co. <Electric> \"Smart\" Meter", usagePoint);
+
         // Marshal to XML using Jackson 3
-        String xml = xmlMapper.writeValueAsString(usagePoint);
+        String xml = xmlMapper.writeValueAsString(entry);
 
         // Verify XML escaping
         assertThat(xml)
@@ -220,9 +259,9 @@ void shouldMarshalSpecialCharactersCorrectly() throws Exception {
         assertThat(xml).contains("&lt;Electric>");  // < is escaped, > in quoted text may not be
 
         // Unmarshal back and verify data integrity using Jackson 3
-        UsagePointDto roundTrip = xmlMapper.readValue(xml, UsagePointDto.class);
+        AtomEntryDto roundTripEntry = xmlMapper.readValue(xml, AtomEntryDto.class);
 
-        assertThat(roundTrip.description()).isEqualTo(usagePoint.description());
+        assertThat(roundTripEntry.title()).isEqualTo(entry.title()); // Description is in Atom title
     }
 
     @Test
@@ -231,15 +270,21 @@ void shouldNotThrowExceptionsDuringMarshalling() {
         // Create UsagePoint
         UsagePointDto usagePoint = new UsagePointDto(
             "urn:uuid:test-no-exceptions",
-            "Test Service",
-            null, null, null,
-            null, null, null, null,
-            null, null, null,
-            null, null, null
+            null, // roleFlags
+            null, // serviceCategory
+            null, // status
+            null, null, null, null, null, // serviceDeliveryPoint, amiBillingReady, checkBilling, connectionState, estimatedLoad
+            null, null, null, null, // grounded, isSdp, isVirtual, minimalUsageExpected
+            null, null, null, null, null, // nominalServiceVoltage, outageRegion, phaseCode, ratedCurrent, ratedPower
+            null, null, null, null, // readCycle, readRoute, serviceDeliveryRemark, servicePriority
+            null, null, null, null, null // pnodeRefs, aggregatedNodeRefs, meterReadings, usageSummaries, electricPowerQualitySummaries
         );
 
+        // Wrap in Atom entry with description as title (IdentifiedObject fields handled by Atom layer)
+        AtomEntryDto entry = new AtomEntryDto("urn:uuid:test-no-exceptions", "Test Service", usagePoint);
+
         // Verify marshalling does not throw using Jackson 3
-        assertThatCode(() -> xmlMapper.writeValueAsString(usagePoint))
+        assertThatCode(() -> xmlMapper.writeValueAsString(entry))
             .doesNotThrowAnyException();
     }
 }
diff --git a/openespi-common/src/test/java/org/greenbuttonalliance/espi/common/MigrationVerificationTest.java b/openespi-common/src/test/java/org/greenbuttonalliance/espi/common/MigrationVerificationTest.java
index 5bd30f9e..9498e901 100644
--- a/openespi-common/src/test/java/org/greenbuttonalliance/espi/common/MigrationVerificationTest.java
+++ b/openespi-common/src/test/java/org/greenbuttonalliance/espi/common/MigrationVerificationTest.java
@@ -25,6 +25,7 @@
 import org.greenbuttonalliance.espi.common.domain.customer.entity.CustomerEntity;
 import org.greenbuttonalliance.espi.common.domain.customer.entity.MeterEntity;
 import org.greenbuttonalliance.espi.common.domain.customer.entity.ServiceLocationEntity;
+import org.greenbuttonalliance.espi.common.dto.atom.AtomEntryDto;
 import org.greenbuttonalliance.espi.common.dto.usage.UsagePointDto;
 import org.greenbuttonalliance.espi.common.dto.SummaryMeasurementDto;
 import org.junit.jupiter.api.Test;
@@ -88,13 +89,27 @@ void jackson3XmlWithJaxbAnnotationsShouldWork() throws Exception {
             .defaultDateFormat(new StdDateFormat())
             .build();
 
-        // Create a simple DTO without constructor arguments
-        UsagePointDto dto = new UsagePointDto();
+        // Create a simple DTO with all nulls
+        UsagePointDto dto = new UsagePointDto(
+            null, // uuid
+            null, // roleFlags
+            null, // serviceCategory
+            null, // status
+            null, null, null, null, null, // serviceDeliveryPoint, amiBillingReady, checkBilling, connectionState, estimatedLoad
+            null, null, null, null, // grounded, isSdp, isVirtual, minimalUsageExpected
+            null, null, null, null, null, // nominalServiceVoltage, outageRegion, phaseCode, ratedCurrent, ratedPower
+            null, null, null, null, // readCycle, readRoute, serviceDeliveryRemark, servicePriority
+            null, null, null, null, null // pnodeRefs, aggregatedNodeRefs, meterReadings, usageSummaries, electricPowerQualitySummaries
+        );
+
+        // Wrap in Atom entry (IdentifiedObject fields handled by Atom layer)
+        AtomEntryDto entry = new AtomEntryDto(null, null, dto);
 
         // Marshal using Jackson 3
-        String xml = assertDoesNotThrow(() -> xmlMapper.writeValueAsString(dto));
+        String xml = assertDoesNotThrow(() -> xmlMapper.writeValueAsString(entry));
 
         // Verify XML structure
+        assertTrue(xml.contains("entry")); // Now wrapping in Atom entry
         assertTrue(xml.contains("UsagePoint"));
         assertTrue(xml.contains("http://naesb.org/espi"));
     }
diff --git a/openespi-common/src/test/java/org/greenbuttonalliance/espi/common/XmlDebugTest.java b/openespi-common/src/test/java/org/greenbuttonalliance/espi/common/XmlDebugTest.java
index 267cc3bb..ad750ac3 100644
--- a/openespi-common/src/test/java/org/greenbuttonalliance/espi/common/XmlDebugTest.java
+++ b/openespi-common/src/test/java/org/greenbuttonalliance/espi/common/XmlDebugTest.java
@@ -20,6 +20,7 @@
 package org.greenbuttonalliance.espi.common;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import org.greenbuttonalliance.espi.common.dto.atom.AtomEntryDto;
 import org.greenbuttonalliance.espi.common.dto.usage.UsagePointDto;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
@@ -71,17 +72,21 @@ void debugXmlOutput() throws Exception {
         // Create a simple UsagePointDto
         UsagePointDto usagePoint = new UsagePointDto(
             "urn:uuid:debug-test",
-            "Debug Service",
             new byte[]{0x01}, // Simple role flag
             null, // serviceCategory
             (short) 1, // Active status
-            null, null, null, null, // measurement fields
-            null, null, null, // reference fields
-            null, null, null // collection fields
+            null, null, null, null, null, // serviceDeliveryPoint, amiBillingReady, checkBilling, connectionState, estimatedLoad
+            null, null, null, null, // grounded, isSdp, isVirtual, minimalUsageExpected
+            null, null, null, null, null, // nominalServiceVoltage, outageRegion, phaseCode, ratedCurrent, ratedPower
+            null, null, null, null, // readCycle, readRoute, serviceDeliveryRemark, servicePriority
+            null, null, null, null, null // pnodeRefs, aggregatedNodeRefs, meterReadings, usageSummaries, electricPowerQualitySummaries
         );
 
+        // Wrap in Atom entry with description as title (IdentifiedObject fields handled by Atom layer)
+        AtomEntryDto entry = new AtomEntryDto("urn:uuid:debug-test", "Debug Service", usagePoint);
+
         // Marshal to XML using Jackson 3
-        String xml = xmlMapper.writeValueAsString(usagePoint);
+        String xml = xmlMapper.writeValueAsString(entry);
 
         // Print the actual XML for debugging
         System.out.println("Generated XML (Jackson 3):");
@@ -94,19 +99,21 @@ void debugXmlOutput() throws Exception {
         assertThat(xml.trim()).isNotEmpty();
 
         // Validate root element
+        assertThat(xml).contains("entry"); // Now wrapping in Atom entry
         assertThat(xml).contains("UsagePoint");
 
         // Validate ESPI namespace
         assertThat(xml).contains("http://naesb.org/espi");
 
         // Validate content
-        assertThat(xml).contains("Debug Service");
+        assertThat(xml).contains("Debug Service"); // In Atom title
         assertThat(xml).containsPattern("<status[^>]*>1</status>");
         assertThat(xml).contains("01"); // roleFlags as hex
 
-        // Validate XML structure
-        assertThat(xml).startsWith("<UsagePoint");
-        assertThat(xml.trim()).endsWith("</UsagePoint>"); // Trim whitespace
+        // Validate XML structure - now wrapped in Atom entry
+        assertThat(xml).contains("<entry");
+        assertThat(xml).contains("<title>Debug Service</title>");
+        assertThat(xml).contains("</entry>");
 
         // Validate no utility methods are serialized (should have @XmlTransient)
         assertThat(xml).doesNotContain("meterReadingCount");
@@ -121,17 +128,21 @@ void debugComplexUsagePoint() throws Exception {
         // Create UsagePoint with more fields populated
         UsagePointDto usagePoint = new UsagePointDto(
             "urn:uuid:complex-test",
-            "Complex Service with Special & Characters <test>",
             new byte[]{0x01, 0x02, 0x03, 0x04},
             null, // serviceCategory
             (short) 2,
+            null, null, null, null, null,
+            null, null, null, null,
+            null, null, null, null, null,
             null, null, null, null,
-            null, null, null,
-            null, null, null
+            null, null, null, null, null
         );
 
+        // Wrap in Atom entry with description as title (IdentifiedObject fields handled by Atom layer)
+        AtomEntryDto entry = new AtomEntryDto("urn:uuid:complex-test", "Complex Service with Special & Characters <test>", usagePoint);
+
         // Marshal to XML using Jackson 3
-        String xml = xmlMapper.writeValueAsString(usagePoint);
+        String xml = xmlMapper.writeValueAsString(entry);
 
         // Print for debugging
         System.out.println("\nComplex XML (Jackson 3):");
@@ -146,27 +157,33 @@ void debugComplexUsagePoint() throws Exception {
         // Validate hex encoding of roleFlags
         assertThat(xml).contains("01020304");
 
-        // Validate structure
+        // Validate structure - description in Atom title
         assertThat(xml).contains("Complex Service with Special &amp; Characters &lt;test>");
+        assertThat(xml).contains("<entry");
+        assertThat(xml).contains("</entry>");
     }
 
     @Test
     @DisplayName("Debug: Minimal UsagePoint (mostly nulls)")
     void debugMinimalUsagePoint() throws Exception {
-        // Create minimal UsagePoint - full constructor has 15 parameters
+        // Create minimal UsagePoint
         UsagePointDto usagePoint = new UsagePointDto(
             "urn:uuid:minimal-test", // uuid
-            null, // description
             null, // roleFlags
             null, // serviceCategory
             null, // status
-            null, null, null, null, // 4 measurement fields
-            null, null, null, // serviceDeliveryPoint, pnodeRefs, aggregatedNodeRefs
-            null, null, null // 3 collection fields
+            null, null, null, null, null, // serviceDeliveryPoint, amiBillingReady, checkBilling, connectionState, estimatedLoad
+            null, null, null, null, // grounded, isSdp, isVirtual, minimalUsageExpected
+            null, null, null, null, null, // nominalServiceVoltage, outageRegion, phaseCode, ratedCurrent, ratedPower
+            null, null, null, null, // readCycle, readRoute, serviceDeliveryRemark, servicePriority
+            null, null, null, null, null // pnodeRefs, aggregatedNodeRefs, meterReadings, usageSummaries, electricPowerQualitySummaries
         );
 
+        // Wrap in Atom entry with null title (IdentifiedObject fields handled by Atom layer)
+        AtomEntryDto entry = new AtomEntryDto("urn:uuid:minimal-test", null, usagePoint);
+
         // Marshal to XML using Jackson 3
-        String xml = xmlMapper.writeValueAsString(usagePoint);
+        String xml = xmlMapper.writeValueAsString(entry);
 
         // Print for debugging
         System.out.println("\nMinimal XML (Jackson 3):");
@@ -175,11 +192,12 @@ void debugMinimalUsagePoint() throws Exception {
         System.out.println("========================\n");
 
         // Validate minimal structure
+        assertThat(xml).contains("entry"); // Now wrapping in Atom entry
         assertThat(xml).contains("UsagePoint");
         assertThat(xml).contains("http://naesb.org/espi");
 
         // Validate that null fields are not included (NON_EMPTY policy)
-        assertThat(xml).doesNotContain("<description");
+        assertThat(xml).doesNotContain("<description"); // Still no description in content
         assertThat(xml).doesNotContain("<roleFlags");
     }
 }
diff --git a/openespi-common/src/test/java/org/greenbuttonalliance/espi/common/dto/usage/SubscriptionDtoTest.java b/openespi-common/src/test/java/org/greenbuttonalliance/espi/common/dto/usage/SubscriptionDtoTest.java
index d2aa8306..ab7138a0 100644
--- a/openespi-common/src/test/java/org/greenbuttonalliance/espi/common/dto/usage/SubscriptionDtoTest.java
+++ b/openespi-common/src/test/java/org/greenbuttonalliance/espi/common/dto/usage/SubscriptionDtoTest.java
@@ -133,7 +133,7 @@ void shouldAddEntriesUsingFluentApi() {
         AtomEntryDto usagePointEntry = new AtomEntryDto(
             "urn:uuid:test-usage-point",
             "Test Usage Point",
-            new UsagePointDto()
+            new UsagePointDto(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null)
         );
 
         AtomEntryDto meterReadingEntry = new AtomEntryDto(
@@ -161,7 +161,7 @@ void shouldAddMultipleEntriesAtOnce() {
         OffsetDateTime now = OffsetDateTime.now(ZoneOffset.UTC);
 
         List<AtomEntryDto> entries = List.of(
-            new AtomEntryDto("urn:uuid:entry1", "Entry 1", new UsagePointDto()),
+            new AtomEntryDto("urn:uuid:entry1", "Entry 1", new UsagePointDto(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null)),
             new AtomEntryDto("urn:uuid:entry2", "Entry 2", new MeterReadingDto())
         );
 
@@ -218,7 +218,7 @@ void shouldConvertToAtomFeedDtoWithCustomerTitle() {
     void shouldIncludeAllEntriesInAtomFeedDto() {
         OffsetDateTime now = OffsetDateTime.now(ZoneOffset.UTC);
 
-        AtomEntryDto entry1 = new AtomEntryDto("urn:uuid:entry1", "Entry 1", new UsagePointDto());
+        AtomEntryDto entry1 = new AtomEntryDto("urn:uuid:entry1", "Entry 1", new UsagePointDto(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null));
         AtomEntryDto entry2 = new AtomEntryDto("urn:uuid:entry2", "Entry 2", new MeterReadingDto());
 
         SubscriptionDto dto = new SubscriptionDto(
diff --git a/openespi-common/src/test/java/org/greenbuttonalliance/espi/common/mapper/usage/SubscriptionMapperTest.java b/openespi-common/src/test/java/org/greenbuttonalliance/espi/common/mapper/usage/SubscriptionMapperTest.java
index a2548578..9001098a 100644
--- a/openespi-common/src/test/java/org/greenbuttonalliance/espi/common/mapper/usage/SubscriptionMapperTest.java
+++ b/openespi-common/src/test/java/org/greenbuttonalliance/espi/common/mapper/usage/SubscriptionMapperTest.java
@@ -118,7 +118,7 @@ void shouldCreateAtomFeedDtoDirectlyWithEntries() {
         SubscriptionEntity entity = new SubscriptionEntity(TEST_SUBSCRIPTION_ID);
 
         List<AtomEntryDto> entries = List.of(
-            new AtomEntryDto("urn:uuid:entry1", "Usage Point", new UsagePointDto()),
+            new AtomEntryDto("urn:uuid:entry1", "Usage Point", new UsagePointDto(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null)),
             new AtomEntryDto("urn:uuid:entry2", "Meter Reading", new MeterReadingDto())
         );
 
diff --git a/openespi-common/src/test/java/org/greenbuttonalliance/espi/common/service/impl/DtoExportServiceImplTest.java b/openespi-common/src/test/java/org/greenbuttonalliance/espi/common/service/impl/DtoExportServiceImplTest.java
index 0d8c4664..e247b17c 100644
--- a/openespi-common/src/test/java/org/greenbuttonalliance/espi/common/service/impl/DtoExportServiceImplTest.java
+++ b/openespi-common/src/test/java/org/greenbuttonalliance/espi/common/service/impl/DtoExportServiceImplTest.java
@@ -6,8 +6,9 @@
 import org.greenbuttonalliance.espi.common.dto.atom.AtomEntryDto;
 import org.greenbuttonalliance.espi.common.dto.atom.AtomFeedDto;
 import org.greenbuttonalliance.espi.common.dto.atom.LinkDto;
+import org.greenbuttonalliance.espi.common.dto.BillingChargeSourceDto;
+import org.greenbuttonalliance.espi.common.dto.SummaryMeasurementDto;
 import org.greenbuttonalliance.espi.common.dto.usage.*;
-import org.greenbuttonalliance.espi.common.mapper.DateTimeMapperImpl;
 import org.greenbuttonalliance.espi.common.mapper.usage.*;
 import org.greenbuttonalliance.espi.common.repositories.usage.UsagePointRepository;
 import org.jspecify.annotations.NonNull;
@@ -43,9 +44,8 @@ class DtoExportServiceImplTest {
 
     @BeforeEach
     void setUp() {
-        ReflectionTestUtils.setField(usagePointMapper, "dateTimeMapper", new DateTimeMapperImpl());
+        // UsagePointMapper only needs serviceDeliveryPointMapper (no date fields after IdentifiedObject removal)
         ReflectionTestUtils.setField(usagePointMapper, "serviceDeliveryPointMapper", new ServiceDeliveryPointMapperImpl());
-        ReflectionTestUtils.setField(meterReadingMapper, "dateTimeMapper", new DateTimeMapperImpl());
 
         dtoExportService = new DtoExportServiceImpl(usagePointRepository, usagePointMapper);
     }
@@ -61,11 +61,15 @@ void shouldExportAtomFeedWithValidXmlStructure() throws IOException {
         AtomEntryDto meterReadingEntryDto = getMeeterReadingEntryDto(now);
         AtomEntryDto readingEntry = getReadingEntryDto(now);
         AtomEntryDto intervalBlockEntry = getIntervlBlockEntryDto(now);
+        AtomEntryDto timeConfigEntry = getTimeConfigurationEntry(now);
+        AtomEntryDto usageSummaryEntry = getUsageSummaryEntry(now);
+        AtomEntryDto epqsEntry = getElectricPowerQualitySummaryEntry(now);
 
         AtomFeedDto atomFeedDto = new AtomFeedDto("urn:uuid:15B0A4ED-CCF4-5521-A0A1-9FF650EC8A6B",
                 "Green Button Subscription Feed",
                 now, now, null,
-                List.of(usagePointEntryDto, meterReadingEntryDto, readingEntry, intervalBlockEntry));
+                List.of(usagePointEntryDto, meterReadingEntryDto, readingEntry, intervalBlockEntry,
+                        timeConfigEntry, usageSummaryEntry, epqsEntry));
 
         // Act
         ByteArrayOutputStream stream = new ByteArrayOutputStream();
@@ -97,11 +101,41 @@ void shouldExportAtomFeedWithValidXmlStructure() throws IOException {
         assertThat(xml).contains("<content>");
         assertThat(xml).contains("</content>");
 
-        // Assert - All 4 entries present
+        // Assert - All 7 entries present
         assertThat(xml).contains("Front Electric Meter");  // UsagePoint title
         assertThat(xml).contains("Meter Reading");  // MeterReading title
         assertThat(xml).contains("Type of Meter Reading Data");  // ReadingType title
         assertThat(xml).contains("Interval Block");  // IntervalBlock title
+        assertThat(xml).contains("EST Time Configuration");  // TimeConfiguration title
+        assertThat(xml).contains("Monthly Usage Summary");  // UsageSummary title
+        assertThat(xml).contains("Power Quality Summary");  // ElectricPowerQualitySummary title
+
+        // Assert - UsageSummary fields with populated data
+        assertThat(xml).contains("<billLastPeriod");
+        assertThat(xml).contains("150000");  // billLastPeriod value
+        assertThat(xml).contains("<currency");
+        assertThat(xml).contains("USD");
+        assertThat(xml).contains("<qualityOfReading");
+        assertThat(xml).contains("14");  // qualityOfReading value
+        assertThat(xml).contains("<tariffProfile");
+        assertThat(xml).contains("TOU-Residential");
+        assertThat(xml).contains("<tariffRiderRefs");
+        assertThat(xml).contains("Green-Energy-Rider");
+        assertThat(xml).contains("<billingChargeSource");
+        assertThat(xml).contains("MEASURED");
+
+        // Assert - ElectricPowerQualitySummary fields with populated data
+        assertThat(xml).contains("<flickerPlt");
+        assertThat(xml).contains("850");  // flickerPlt value
+        assertThat(xml).contains("<harmonicVoltage");
+        assertThat(xml).contains("320");  // harmonicVoltage value
+        assertThat(xml).contains("<mainsVoltage");
+        assertThat(xml).contains("120000");  // mainsVoltage value
+        assertThat(xml).contains("<powerFrequency");
+        assertThat(xml).contains("60000");  // powerFrequency value
+        assertThat(xml).contains("<measurementProtocol");
+        assertThat(xml).contains("<supplyVoltageImbalance");
+        assertThat(xml).contains("150");  // supplyVoltageImbalance value
     }
 
     @Test
@@ -347,4 +381,95 @@ AtomEntryDto getUsagePointEntry(OffsetDateTime now) {
                 usagePointList,
                 usagePointDto);
     }
+
+    private static @NonNull AtomEntryDto getTimeConfigurationEntry(OffsetDateTime now) {
+        // TimeConfigurationDto full constructor: id, uuid, dstEndRule, dstOffset, dstStartRule, tzOffset
+        TimeConfigurationDto timeConfigDto = new TimeConfigurationDto(
+                null,      // id (ignored - handled by Atom layer)
+                null,      // uuid (handled by Atom layer)
+                null,      // dstEndRule (byte[])
+                3600L,     // dstOffset (1 hour DST in seconds)
+                null,      // dstStartRule (byte[])
+                -18000L    // tzOffset (-5 hours in seconds = EST)
+        );
+
+        List<LinkDto> links = new ArrayList<>();
+        links.add(new LinkDto("self", "/espi/1_1/resource/LocalTimeParameters/01"));
+        links.add(new LinkDto("up", "/espi/1_1/resource/LocalTimeParameters"));
+
+        return new AtomEntryDto("urn:uuid:2A0B8C3D-4E5F-5678-90AB-CDEF12345678", "EST Time Configuration",
+                now, now, links, timeConfigDto);
+    }
+
+    private static @NonNull AtomEntryDto getUsageSummaryEntry(OffsetDateTime now) {
+        // Canonical constructor: id, uuid, + 24 XSD fields with comprehensive test data
+        UsageSummaryDto usageSummaryDto = new UsageSummaryDto(
+                null,     // id
+                null,     // uuid
+                new DateTimeIntervalDto(1330578000L, 2592000L), // billingPeriod (30 days)
+                150000L,  // billLastPeriod ($1500.00 in cents)
+                175000L,  // billToDate ($1750.00 in cents)
+                25000L,   // costAdditionalLastPeriod ($250.00 additional charges)
+                List.of(new LineItemDto(15000L, 0L, 1332392400L, "Demand Charge", null, 2, null, null),
+                        new LineItemDto(10000L, 0L, 1332392400L, "Service Fee", null, 3, null, null)),
+                "USD",    // currency
+                new SummaryMeasurementDto("3", 1330578000L, "72", 450000L, null), // overallConsumptionLastPeriod (450 kWh)
+                new SummaryMeasurementDto("3", 1333256400L, "72", 425000L, null), // currentBillingPeriodOverAllConsumption (425 kWh)
+                new SummaryMeasurementDto("3", 1330491600L, "72", 390000L, null), // currentDayLastYearNetConsumption (390 kWh)
+                new SummaryMeasurementDto("3", 1333256400L, "72", 15000L, null),  // currentDayNetConsumption (15 kWh)
+                new SummaryMeasurementDto("3", 1333256400L, "72", 16000L, null),  // currentDayOverallConsumption (16 kWh)
+                new SummaryMeasurementDto("38", 1332392400L, "72", 5000L, null),  // peakDemand (5 kW)
+                new SummaryMeasurementDto("3", 1330405200L, "72", 385000L, null), // previousDayLastYearOverallConsumption (385 kWh)
+                new SummaryMeasurementDto("3", 1333170000L, "72", 14500L, null),  // previousDayNetConsumption (14.5 kWh)
+                new SummaryMeasurementDto("3", 1333170000L, "72", 15500L, null),  // previousDayOverallConsumption (15.5 kWh)
+                "14",     // qualityOfReading (VALID)
+                new SummaryMeasurementDto("38", 1331182800L, "72", 4800L, null),  // ratchetDemand (4.8 kW)
+                new DateTimeIntervalDto(1328000000L, 31536000L), // ratchetDemandPeriod (1 year)
+                1333256400L, // statusTimeStamp
+                1,        // commodity (ELECTRICITY_SECONDARY_METERED)
+                "TOU-Residential", // tariffProfile
+                "15",     // readCycle (15th of month)
+                new TariffRiderRefsDto(List.of(
+                        new TariffRiderRefDto("Green-Energy-Rider", "ENROLLED", 1328000000L),
+                        new TariffRiderRefDto("Demand-Response-Credit", "ENROLLED", 1328000000L))),
+                new BillingChargeSourceDto("MEASURED") // billingChargeSource
+        );
+
+        List<LinkDto> links = new ArrayList<>();
+        links.add(new LinkDto("self", "/espi/1_1/resource/RetailCustomer/9B6C7066/UsagePoint/5446AF3F/UsageSummary/01"));
+        links.add(new LinkDto("up", "/espi/1_1/resource/RetailCustomer/9B6C7066/UsagePoint/5446AF3F/UsageSummary"));
+
+        return new AtomEntryDto("urn:uuid:3B1C9D4E-5F6A-5789-01BC-DEF234567890", "Monthly Usage Summary",
+                now, now, links, usageSummaryDto);
+    }
+
+    private static @NonNull AtomEntryDto getElectricPowerQualitySummaryEntry(OffsetDateTime now) {
+        // Canonical constructor: id, uuid, + 14 XSD fields, usagePointId = 17 parameters with comprehensive test data
+        ElectricPowerQualitySummaryDto epqsDto = new ElectricPowerQualitySummaryDto(
+                null,   // id
+                null,   // uuid
+                850L,   // flickerPlt (0.85 long-term flicker severity)
+                720L,   // flickerPst (0.72 short-term flicker severity)
+                320L,   // harmonicVoltage (3.20% THD)
+                2L,     // longInterruptions (2 long interruptions)
+                120000L, // mainsVoltage (120.000 V in millivolts)
+                (short) 4, // measurementProtocol (IEC 61000-4-30)
+                60000L, // powerFrequency (60.000 Hz in millihertz)
+                5L,     // rapidVoltageChanges (5 rapid voltage changes)
+                3L,     // shortInterruptions (3 short interruptions)
+                new DateTimeIntervalDto(1330578000L, 86400L), // summaryInterval (1 day)
+                8L,     // supplyVoltageDips (8 voltage dips)
+                150L,   // supplyVoltageImbalance (1.50% imbalance)
+                250L,   // supplyVoltageVariations (2.50% voltage variation)
+                1L,     // tempOvervoltage (1 temporary overvoltage event)
+                null    // usagePointId
+        );
+
+        List<LinkDto> links = new ArrayList<>();
+        links.add(new LinkDto("self", "/espi/1_1/resource/RetailCustomer/9B6C7066/UsagePoint/5446AF3F/ElectricPowerQualitySummary/01"));
+        links.add(new LinkDto("up", "/espi/1_1/resource/RetailCustomer/9B6C7066/UsagePoint/5446AF3F/ElectricPowerQualitySummary"));
+
+        return new AtomEntryDto("urn:uuid:4C2D0E5F-6A7B-5890-12CD-EF3456789012", "Power Quality Summary",
+                now, now, links, epqsDto);
+    }
 }
\ No newline at end of file

From 4b48c9992fb1da8b9051565d096aad152ca52c2b Mon Sep 17 00:00:00 2001
From: "Donald F. Coffin" <dcoffin@greenbuttonalliance.org>
Date: Fri, 16 Jan 2026 00:06:03 -0500
Subject: [PATCH 2/2] refactor: Remove deprecated AtomContentDto and fix
 Jackson deserialization

- Removed deprecated AtomContentDto class
- Updated AtomEntryDto to handle content directly (payload moved to AtomEntryDto)
- Fixed MigrationVerificationTest to use correct AtomEntryDto constructor
- Added local element names to @JsonSubTypes for Jackson deserialization compatibility
- Updated DtoExportServiceImpl to use EspiIdGeneratorService for UUID5 generation
- Fixed all Jackson3XmlMarshallingTest deserialization issues
- All 580 tests passing with 0 failures and 0 errors

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
---
 .../espi/common/dto/atom/AtomContentDto.java  | 98 -------------------
 .../espi/common/dto/atom/AtomEntryDto.java    | 42 +++++---
 .../service/impl/DtoExportServiceImpl.java    | 20 +++-
 .../common/MigrationVerificationTest.java     | 23 ++++-
 .../impl/DtoExportServiceImplTest.java        |  7 +-
 5 files changed, 71 insertions(+), 119 deletions(-)
 delete mode 100644 openespi-common/src/main/java/org/greenbuttonalliance/espi/common/dto/atom/AtomContentDto.java

diff --git a/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/dto/atom/AtomContentDto.java b/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/dto/atom/AtomContentDto.java
deleted file mode 100644
index b54a36ec..00000000
--- a/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/dto/atom/AtomContentDto.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- *
- *        Copyright (c) 2025 Green Button Alliance, Inc.
- *
- *
- *     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.greenbuttonalliance.espi.common.dto.atom;
-
-import com.fasterxml.jackson.annotation.*;
-import jakarta.xml.bind.annotation.*;
-import org.greenbuttonalliance.espi.common.dto.usage.MeterReadingDto;
-import org.greenbuttonalliance.espi.common.dto.usage.ReadingTypeDto;
-import org.greenbuttonalliance.espi.common.dto.usage.UsagePointDto;
-import tools.jackson.dataformat.xml.annotation.JacksonXmlProperty;
-
-/**
- * Atom Content DTO record for content within Atom entries.
- * 
- * Represents the content section of an Atom entry containing the actual
- * Green Button resource data (Customer, UsagePoint, MeterReading, etc.).
- *
- * @deprecated AtomContentDto no longer used. Payload moved to AtomEntryDto
- */
-@Deprecated
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AtomContent", namespace = "http://www.w3.org/2005/Atom")
-public record AtomContentDto(
-    
-    @XmlAttribute(name = "type")
-    String type,
-
-    @JsonProperty("resource")
-    @JacksonXmlProperty(namespace = "http://naesb.org/espi")
-
-    @XmlElementWrapper(name = "resource", namespace = "http://naesb.org/espi")
-    @JsonTypeInfo(use = JsonTypeInfo.Id.NAME,
-            include = JsonTypeInfo.As.WRAPPER_OBJECT,
-            property = "type")
-    @JsonSubTypes({
-            @JsonSubTypes.Type(value = UsagePointDto.class, name = "UsagePoint"),
-            @JsonSubTypes.Type(value = MeterReadingDto.class, name = "MeterReading"),
-            @JsonSubTypes.Type(value = ReadingTypeDto.class, name = "ReadingType")
-    })
-    @XmlAnyElement(lax = true)
-    Object resource
-) {
-    
-    /**
-     * Default constructor for JAXB.
-     */
-    public AtomContentDto() {
-        this(null, null);
-    }
-    
-    /**
-     * Constructor for XML content.
-     */
-    public AtomContentDto(Object resource) {
-        this("application/xml", resource);
-    }
-    
-    /**
-     * Checks if the content has a resource.
-     * 
-     * @return true if resource is not null
-     */
-    public boolean hasResource() {
-        return resource != null;
-    }
-    
-    /**
-     * Gets the resource cast to a specific type.
-     * 
-     * @param <T> the type to cast to
-     * @param clazz the class to cast to
-     * @return the resource cast to the specified type, or null
-     */
-    @SuppressWarnings("unchecked")
-    public <T> T getResourceAs(Class<T> clazz) {
-        if (resource != null && clazz.isInstance(resource)) {
-            return (T) resource;
-        }
-        return null;
-    }
-}
\ No newline at end of file
diff --git a/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/dto/atom/AtomEntryDto.java b/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/dto/atom/AtomEntryDto.java
index a80f21cc..1a7f09ff 100644
--- a/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/dto/atom/AtomEntryDto.java
+++ b/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/dto/atom/AtomEntryDto.java
@@ -63,7 +63,7 @@ public record AtomEntryDto(
             include = JsonTypeInfo.As.WRAPPER_OBJECT,
             property = "type")
     @JsonSubTypes({
-            // ESPI Usage resources (espi: namespace - top-level IdentifiedObject-based)
+            // Namespace-prefixed names (kept for compatibility)
             @JsonSubTypes.Type(value = ApplicationInformationDto.class, name = "espi:ApplicationInformation"),
             @JsonSubTypes.Type(value = AuthorizationDto.class, name = "espi:Authorization"),
             @JsonSubTypes.Type(value = ElectricPowerQualitySummaryDto.class, name = "espi:ElectricPowerQualitySummary"),
@@ -73,19 +73,35 @@ public record AtomEntryDto(
             @JsonSubTypes.Type(value = TimeConfigurationDto.class, name = "espi:TimeConfiguration"),
             @JsonSubTypes.Type(value = UsagePointDto.class, name = "espi:UsagePoint"),
             @JsonSubTypes.Type(value = UsageSummaryDto.class, name = "espi:UsageSummary"),
-            // ESPI Customer resources (cust: namespace - top-level IdentifiedObject-based)
             @JsonSubTypes.Type(value = CustomerDto.class, name = "cust:Customer"),
             @JsonSubTypes.Type(value = CustomerAccountDto.class, name = "cust:CustomerAccount"),
             @JsonSubTypes.Type(value = CustomerAgreementDto.class, name = "cust:CustomerAgreement"),
             @JsonSubTypes.Type(value = EndDeviceDto.class, name = "cust:EndDevice"),
             @JsonSubTypes.Type(value = MeterDto.class, name = "cust:Meter"),
             @JsonSubTypes.Type(value = ProgramDateIdMappingsDto.class, name = "cust:ProgramDateIdMappings"),
-            // Note: TimeConfigurationDto supports BOTH espi: and cust: namespaces (same type in both schemas)
             @JsonSubTypes.Type(value = TimeConfigurationDto.class, name = "cust:TimeConfiguration"),
             @JsonSubTypes.Type(value = ServiceLocationDto.class, name = "cust:ServiceLocation"),
-            @JsonSubTypes.Type(value = StatementDto.class, name = "cust:Statement")
+            @JsonSubTypes.Type(value = StatementDto.class, name = "cust:Statement"),
+            // Local element names (for Jackson deserialization which uses local name without prefix)
+            @JsonSubTypes.Type(value = ApplicationInformationDto.class, name = "ApplicationInformation"),
+            @JsonSubTypes.Type(value = AuthorizationDto.class, name = "Authorization"),
+            @JsonSubTypes.Type(value = ElectricPowerQualitySummaryDto.class, name = "ElectricPowerQualitySummary"),
+            @JsonSubTypes.Type(value = IntervalBlockDto.class, name = "IntervalBlock"),
+            @JsonSubTypes.Type(value = MeterReadingDto.class, name = "MeterReading"),
+            @JsonSubTypes.Type(value = ReadingTypeDto.class, name = "ReadingType"),
+            @JsonSubTypes.Type(value = TimeConfigurationDto.class, name = "TimeConfiguration"),
+            @JsonSubTypes.Type(value = UsagePointDto.class, name = "UsagePoint"),
+            @JsonSubTypes.Type(value = UsageSummaryDto.class, name = "UsageSummary"),
+            @JsonSubTypes.Type(value = CustomerDto.class, name = "Customer"),
+            @JsonSubTypes.Type(value = CustomerAccountDto.class, name = "CustomerAccount"),
+            @JsonSubTypes.Type(value = CustomerAgreementDto.class, name = "CustomerAgreement"),
+            @JsonSubTypes.Type(value = EndDeviceDto.class, name = "EndDevice"),
+            @JsonSubTypes.Type(value = MeterDto.class, name = "Meter"),
+            @JsonSubTypes.Type(value = ProgramDateIdMappingsDto.class, name = "ProgramDateIdMappings"),
+            @JsonSubTypes.Type(value = ServiceLocationDto.class, name = "ServiceLocation"),
+            @JsonSubTypes.Type(value = StatementDto.class, name = "Statement")
             // TODO: Add when ServiceSupplierDto is implemented:
-            // @JsonSubTypes.Type(value = ServiceSupplierDto.class, name = "cust:ServiceSupplier")
+            // @JsonSubTypes.Type(value = ServiceSupplierDto.class, name = "ServiceSupplier")
     })
     @XmlAnyElement(lax = true)
     @XmlElement(name = "content", namespace = "http://www.w3.org/2005/Atom")
@@ -122,16 +138,20 @@ public AtomEntryDto(String id, String title, OffsetDateTime published,
     }
 
     /**
-     * Constructor for basic entry data with auto-generated timestamps.
+     * Convenience constructor for testing with auto-generated timestamps.
+     * Creates an AtomEntryDto with current timestamp and no links.
+     *
+     * @param id the entry identifier (urn:uuid:xxx format)
+     * @param title the entry title
+     * @param content the resource content (payload moved directly to AtomEntryDto)
      */
-    public AtomEntryDto(String id, String title, Object resource) {
+    public AtomEntryDto(String id, String title, Object content) {
         LocalDateTime localDateTime = LocalDateTime.now().truncatedTo(java.time.temporal.ChronoUnit.SECONDS);
         OffsetDateTime now = localDateTime.atOffset(ZoneOffset.UTC).toZonedDateTime().toOffsetDateTime();
-
-        this(id, title, now, now, null,
-             new AtomContentDto("application/xml", resource), null, null);
+        this(id, title, now, now, null, content, null, null);
     }
-    
+
+
     /**
      * Gets the self link from the entry links.
      * 
diff --git a/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/service/impl/DtoExportServiceImpl.java b/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/service/impl/DtoExportServiceImpl.java
index 48e793fe..5bc8697c 100644
--- a/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/service/impl/DtoExportServiceImpl.java
+++ b/openespi-common/src/main/java/org/greenbuttonalliance/espi/common/service/impl/DtoExportServiceImpl.java
@@ -58,6 +58,7 @@ public class DtoExportServiceImpl implements DtoExportService {
 
     private final UsagePointRepository usagePointRepository;
     private final UsagePointMapper usagePointMapper;
+    private final org.greenbuttonalliance.espi.common.service.EspiIdGeneratorService espiIdGeneratorService;
 
     private final String XML_HEADER = """
             <?xml version="1.0" encoding="UTF-8"?>
@@ -187,10 +188,23 @@ public AtomFeedDto createAtomFeed(String title, List<AtomEntryDto> entries) {
 
     @Override
     public AtomEntryDto createAtomEntry(String title, Object resource) {
+        java.time.LocalDateTime localDateTime = java.time.LocalDateTime.now()
+            .truncatedTo(java.time.temporal.ChronoUnit.SECONDS);
+        java.time.OffsetDateTime now = localDateTime.atOffset(java.time.ZoneOffset.UTC)
+            .toZonedDateTime().toOffsetDateTime();
+
+        // Generate a UUID5 using title and resource type as the base
+        // Using the subscription pattern: combine title + resource class + timestamp for uniqueness
+        String resourceType = resource.getClass().getSimpleName();
+        UUID uuid5 = espiIdGeneratorService.generateSubscriptionId(resourceType, title);
+
         return new AtomEntryDto(
-            UUID.randomUUID().toString(),  // id
-            title,                         // title
-            resource                      // resource (uses convenience constructor)
+            "urn:uuid:" + uuid5.toString(),  // id - Version 5 UUID
+            title,                           // title
+            now,                             // published
+            now,                             // updated
+            null,                            // links
+            resource                         // content (payload moved directly to AtomEntryDto)
         );
     }
 }
\ No newline at end of file
diff --git a/openespi-common/src/test/java/org/greenbuttonalliance/espi/common/MigrationVerificationTest.java b/openespi-common/src/test/java/org/greenbuttonalliance/espi/common/MigrationVerificationTest.java
index 9498e901..ac62e503 100644
--- a/openespi-common/src/test/java/org/greenbuttonalliance/espi/common/MigrationVerificationTest.java
+++ b/openespi-common/src/test/java/org/greenbuttonalliance/espi/common/MigrationVerificationTest.java
@@ -102,16 +102,29 @@ void jackson3XmlWithJaxbAnnotationsShouldWork() throws Exception {
             null, null, null, null, null // pnodeRefs, aggregatedNodeRefs, meterReadings, usageSummaries, electricPowerQualitySummaries
         );
 
-        // Wrap in Atom entry (IdentifiedObject fields handled by Atom layer)
-        AtomEntryDto entry = new AtomEntryDto(null, null, dto);
+        // Wrap in Atom entry using full constructor (payload moved directly to AtomEntryDto, no AtomContentDto wrapper)
+        java.time.LocalDateTime localDateTime = java.time.LocalDateTime.now().truncatedTo(java.time.temporal.ChronoUnit.SECONDS);
+        java.time.OffsetDateTime now = localDateTime.atOffset(java.time.ZoneOffset.UTC).toZonedDateTime().toOffsetDateTime();
+        AtomEntryDto entry = new AtomEntryDto(
+            "urn:uuid:test-entry",
+            "Test Usage Point",
+            now,
+            now,
+            null, // links
+            dto   // content - passed directly (AtomEntryDto now includes AtomContentDto functionality)
+        );
 
         // Marshal using Jackson 3
         String xml = assertDoesNotThrow(() -> xmlMapper.writeValueAsString(entry));
 
+        // Debug: print XML
+        System.out.println("Generated XML:");
+        System.out.println(xml);
+
         // Verify XML structure
-        assertTrue(xml.contains("entry")); // Now wrapping in Atom entry
-        assertTrue(xml.contains("UsagePoint"));
-        assertTrue(xml.contains("http://naesb.org/espi"));
+        assertTrue(xml.contains("entry"), "XML should contain 'entry' element"); // Now wrapping in Atom entry
+        assertTrue(xml.contains("UsagePoint"), "XML should contain 'UsagePoint' element");
+        assertTrue(xml.contains("http://naesb.org/espi"), "XML should contain ESPI namespace");
     }
 
     @Test
diff --git a/openespi-common/src/test/java/org/greenbuttonalliance/espi/common/service/impl/DtoExportServiceImplTest.java b/openespi-common/src/test/java/org/greenbuttonalliance/espi/common/service/impl/DtoExportServiceImplTest.java
index e247b17c..1abcb479 100644
--- a/openespi-common/src/test/java/org/greenbuttonalliance/espi/common/service/impl/DtoExportServiceImplTest.java
+++ b/openespi-common/src/test/java/org/greenbuttonalliance/espi/common/service/impl/DtoExportServiceImplTest.java
@@ -47,7 +47,11 @@ void setUp() {
         // UsagePointMapper only needs serviceDeliveryPointMapper (no date fields after IdentifiedObject removal)
         ReflectionTestUtils.setField(usagePointMapper, "serviceDeliveryPointMapper", new ServiceDeliveryPointMapperImpl());
 
-        dtoExportService = new DtoExportServiceImpl(usagePointRepository, usagePointMapper);
+        // Create EspiIdGeneratorService for UUID5 generation
+        org.greenbuttonalliance.espi.common.service.EspiIdGeneratorService espiIdGeneratorService =
+            new org.greenbuttonalliance.espi.common.service.EspiIdGeneratorService();
+
+        dtoExportService = new DtoExportServiceImpl(usagePointRepository, usagePointMapper, espiIdGeneratorService);
     }
 
     @Test
@@ -329,7 +333,6 @@ void shouldExportEspiIntervalBlockContent() throws IOException {
                 null, "4", "1", null, "840", "12", "NET", "TOTAL", 900L, "NET", "KILO", "DAILY", "V", "1", "CONTINUOUS", "1", null,
                 null, null);
 
-        // AtomContentDto readingTypeDtoContent = new AtomContentDto(readingTypeDto);
         List<LinkDto> readingTypeLinkList = new ArrayList<>();
         readingTypeLinkList.add(new LinkDto("self", "/espi/1_1/resource/ReadingType/07"));
         readingTypeLinkList.add(new LinkDto("up", "/espi/1_1/resource/ReadingType"));