diff --git a/redfish-core/include/aggregation_utils.hpp b/redfish-core/include/aggregation_utils.hpp
index c9e7278..c71ff0e 100644
--- a/redfish-core/include/aggregation_utils.hpp
+++ b/redfish-core/include/aggregation_utils.hpp
@@ -20,10 +20,11 @@
 {
 // Note that each URI actually begins with "/redfish/v1"
 // They've been omitted to save space and reduce search time
-constexpr std::array<std::string_view, 50> topCollections{
+constexpr std::array<std::string_view, 55> topCollections{
     "/AggregationService/Aggregates",
     "/AggregationService/AggregationSources",
     "/AggregationService/ConnectionMethods",
+    "/AutomationNodes",
     "/Cables",
     "/Chassis",
     "/ComponentIntegrity",
@@ -35,6 +36,8 @@
     "/EventService/Subscriptions",
     "/Fabrics",
     "/Facilities",
+    "/JobService/JobDocuments",
+    "/JobService/JobExecutors",
     "/JobService/Jobs",
     "/JobService/Log/Entries",
     "/KeyService/NVMeoFKeyPolicies",
@@ -61,11 +64,13 @@
     "/TelemetryService/MetricDefinitions",
     "/TelemetryService/MetricReportDefinitions",
     "/TelemetryService/MetricReports",
+    "/TelemetryService/TelemetryData",
     "/TelemetryService/Triggers",
     "/ThermalEquipment/CDUs",
     "/ThermalEquipment/CoolingLoops",
     "/ThermalEquipment/HeatExchangers",
     "/ThermalEquipment/ImmersionUnits",
+    "/ThermalEquipment/RPUs",
     "/UpdateService/ClientCertificates",
     "/UpdateService/FirmwareInventory",
     "/UpdateService/RemoteServerCertificates",
diff --git a/redfish-core/include/generated/enums/automation_node.hpp b/redfish-core/include/generated/enums/automation_node.hpp
new file mode 100644
index 0000000..fc39425
--- /dev/null
+++ b/redfish-core/include/generated/enums/automation_node.hpp
@@ -0,0 +1,81 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: Copyright OpenBMC Authors
+#pragma once
+#include <nlohmann/json.hpp>
+
+namespace automation_node
+{
+// clang-format off
+
+enum class NodeState{
+    Invalid,
+    Idle,
+    Done,
+    Waiting,
+    ConditionStop,
+    ErrorStop,
+    Running,
+};
+
+enum class NodeType{
+    Invalid,
+    MotionPosition,
+    MotionVelocity,
+    MotionPositionGroup,
+    PID,
+    Simple,
+};
+
+enum class MotionProfileType{
+    Invalid,
+    Trapezoidal,
+    SCurve,
+    None,
+};
+
+enum class MotionAxisType{
+    Invalid,
+    X,
+    Y,
+    Z,
+    TwoAxis,
+    ThreeAxis,
+};
+
+NLOHMANN_JSON_SERIALIZE_ENUM(NodeState, {
+    {NodeState::Invalid, "Invalid"},
+    {NodeState::Idle, "Idle"},
+    {NodeState::Done, "Done"},
+    {NodeState::Waiting, "Waiting"},
+    {NodeState::ConditionStop, "ConditionStop"},
+    {NodeState::ErrorStop, "ErrorStop"},
+    {NodeState::Running, "Running"},
+});
+
+NLOHMANN_JSON_SERIALIZE_ENUM(NodeType, {
+    {NodeType::Invalid, "Invalid"},
+    {NodeType::MotionPosition, "MotionPosition"},
+    {NodeType::MotionVelocity, "MotionVelocity"},
+    {NodeType::MotionPositionGroup, "MotionPositionGroup"},
+    {NodeType::PID, "PID"},
+    {NodeType::Simple, "Simple"},
+});
+
+NLOHMANN_JSON_SERIALIZE_ENUM(MotionProfileType, {
+    {MotionProfileType::Invalid, "Invalid"},
+    {MotionProfileType::Trapezoidal, "Trapezoidal"},
+    {MotionProfileType::SCurve, "SCurve"},
+    {MotionProfileType::None, "None"},
+});
+
+NLOHMANN_JSON_SERIALIZE_ENUM(MotionAxisType, {
+    {MotionAxisType::Invalid, "Invalid"},
+    {MotionAxisType::X, "X"},
+    {MotionAxisType::Y, "Y"},
+    {MotionAxisType::Z, "Z"},
+    {MotionAxisType::TwoAxis, "TwoAxis"},
+    {MotionAxisType::ThreeAxis, "ThreeAxis"},
+});
+
+}
+// clang-format on
diff --git a/redfish-core/include/generated/enums/battery.hpp b/redfish-core/include/generated/enums/battery.hpp
index 78f2491..3aac115 100644
--- a/redfish-core/include/generated/enums/battery.hpp
+++ b/redfish-core/include/generated/enums/battery.hpp
@@ -14,6 +14,19 @@
     Discharging,
 };
 
+enum class BatteryChemistryType{
+    Invalid,
+    LeadAcid,
+    LithiumIon,
+    NickelCadmium,
+};
+
+enum class EnergyStorageType{
+    Invalid,
+    Battery,
+    Supercapacitor,
+};
+
 NLOHMANN_JSON_SERIALIZE_ENUM(ChargeState, {
     {ChargeState::Invalid, "Invalid"},
     {ChargeState::Idle, "Idle"},
@@ -21,5 +34,18 @@
     {ChargeState::Discharging, "Discharging"},
 });
 
+NLOHMANN_JSON_SERIALIZE_ENUM(BatteryChemistryType, {
+    {BatteryChemistryType::Invalid, "Invalid"},
+    {BatteryChemistryType::LeadAcid, "LeadAcid"},
+    {BatteryChemistryType::LithiumIon, "LithiumIon"},
+    {BatteryChemistryType::NickelCadmium, "NickelCadmium"},
+});
+
+NLOHMANN_JSON_SERIALIZE_ENUM(EnergyStorageType, {
+    {EnergyStorageType::Invalid, "Invalid"},
+    {EnergyStorageType::Battery, "Battery"},
+    {EnergyStorageType::Supercapacitor, "Supercapacitor"},
+});
+
 }
 // clang-format on
diff --git a/redfish-core/include/generated/enums/certificate.hpp b/redfish-core/include/generated/enums/certificate.hpp
index adef0d1..9969393 100644
--- a/redfish-core/include/generated/enums/certificate.hpp
+++ b/redfish-core/include/generated/enums/certificate.hpp
@@ -12,6 +12,7 @@
     PEM,
     PEMchain,
     PKCS7,
+    PKCS12,
 };
 
 enum class KeyUsage{
@@ -53,6 +54,7 @@
     {CertificateType::PEM, "PEM"},
     {CertificateType::PEMchain, "PEMchain"},
     {CertificateType::PKCS7, "PKCS7"},
+    {CertificateType::PKCS12, "PKCS12"},
 });
 
 NLOHMANN_JSON_SERIALIZE_ENUM(KeyUsage, {
diff --git a/redfish-core/include/generated/enums/connection_method.hpp b/redfish-core/include/generated/enums/connection_method.hpp
index 39c19cd..aeadf07 100644
--- a/redfish-core/include/generated/enums/connection_method.hpp
+++ b/redfish-core/include/generated/enums/connection_method.hpp
@@ -15,6 +15,8 @@
     IPMI20,
     NETCONF,
     OEM,
+    ModbusSerial,
+    ModbusTCP,
 };
 
 enum class TunnelingProtocolType{
@@ -31,6 +33,8 @@
     {ConnectionMethodType::IPMI20, "IPMI20"},
     {ConnectionMethodType::NETCONF, "NETCONF"},
     {ConnectionMethodType::OEM, "OEM"},
+    {ConnectionMethodType::ModbusSerial, "ModbusSerial"},
+    {ConnectionMethodType::ModbusTCP, "ModbusTCP"},
 });
 
 NLOHMANN_JSON_SERIALIZE_ENUM(TunnelingProtocolType, {
diff --git a/redfish-core/include/generated/enums/control.hpp b/redfish-core/include/generated/enums/control.hpp
index 5e6f6cd..cd26b30 100644
--- a/redfish-core/include/generated/enums/control.hpp
+++ b/redfish-core/include/generated/enums/control.hpp
@@ -18,6 +18,12 @@
     Valve,
     Percent,
     DutyCycle,
+    LinearPosition,
+    LinearVelocity,
+    LinearAcceleration,
+    RotationalPosition,
+    RotationalVelocity,
+    RotationalAcceleration,
     LiquidFlowLPM,
 };
 
@@ -25,6 +31,7 @@
     Invalid,
     Single,
     Range,
+    Monitor,
 };
 
 enum class ControlMode{
@@ -53,6 +60,12 @@
     {ControlType::Valve, "Valve"},
     {ControlType::Percent, "Percent"},
     {ControlType::DutyCycle, "DutyCycle"},
+    {ControlType::LinearPosition, "LinearPosition"},
+    {ControlType::LinearVelocity, "LinearVelocity"},
+    {ControlType::LinearAcceleration, "LinearAcceleration"},
+    {ControlType::RotationalPosition, "RotationalPosition"},
+    {ControlType::RotationalVelocity, "RotationalVelocity"},
+    {ControlType::RotationalAcceleration, "RotationalAcceleration"},
     {ControlType::LiquidFlowLPM, "LiquidFlowLPM"},
 });
 
@@ -60,6 +73,7 @@
     {SetPointType::Invalid, "Invalid"},
     {SetPointType::Single, "Single"},
     {SetPointType::Range, "Range"},
+    {SetPointType::Monitor, "Monitor"},
 });
 
 NLOHMANN_JSON_SERIALIZE_ENUM(ControlMode, {
diff --git a/redfish-core/include/generated/enums/cooling_unit.hpp b/redfish-core/include/generated/enums/cooling_unit.hpp
index 92d8c1e..c220439 100644
--- a/redfish-core/include/generated/enums/cooling_unit.hpp
+++ b/redfish-core/include/generated/enums/cooling_unit.hpp
@@ -12,6 +12,7 @@
     CDU,
     HeatExchanger,
     ImmersionUnit,
+    RPU,
 };
 
 enum class CoolingUnitMode{
@@ -25,6 +26,7 @@
     {CoolingEquipmentType::CDU, "CDU"},
     {CoolingEquipmentType::HeatExchanger, "HeatExchanger"},
     {CoolingEquipmentType::ImmersionUnit, "ImmersionUnit"},
+    {CoolingEquipmentType::RPU, "RPU"},
 });
 
 NLOHMANN_JSON_SERIALIZE_ENUM(CoolingUnitMode, {
diff --git a/redfish-core/include/generated/enums/job.hpp b/redfish-core/include/generated/enums/job.hpp
index 4d8be9c..bcd02c7 100644
--- a/redfish-core/include/generated/enums/job.hpp
+++ b/redfish-core/include/generated/enums/job.hpp
@@ -8,7 +8,6 @@
 // clang-format off
 
 enum class JobState{
-    Invalid,
     New,
     Starting,
     Running,
@@ -22,10 +21,18 @@
     Service,
     UserIntervention,
     Continue,
+    Validating,
+    Invalid,
+};
+
+enum class JobType{
+    Invalid,
+    DocumentBased,
+    UserSpecified,
+    ServiceGenerated,
 };
 
 NLOHMANN_JSON_SERIALIZE_ENUM(JobState, {
-    {JobState::Invalid, "Invalid"},
     {JobState::New, "New"},
     {JobState::Starting, "Starting"},
     {JobState::Running, "Running"},
@@ -39,6 +46,15 @@
     {JobState::Service, "Service"},
     {JobState::UserIntervention, "UserIntervention"},
     {JobState::Continue, "Continue"},
+    {JobState::Validating, "Validating"},
+    {JobState::Invalid, "Invalid"},
+});
+
+NLOHMANN_JSON_SERIALIZE_ENUM(JobType, {
+    {JobType::Invalid, "Invalid"},
+    {JobType::DocumentBased, "DocumentBased"},
+    {JobType::UserSpecified, "UserSpecified"},
+    {JobType::ServiceGenerated, "ServiceGenerated"},
 });
 
 }
diff --git a/redfish-core/include/generated/enums/job_document.hpp b/redfish-core/include/generated/enums/job_document.hpp
new file mode 100644
index 0000000..06dfc95
--- /dev/null
+++ b/redfish-core/include/generated/enums/job_document.hpp
@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: Copyright OpenBMC Authors
+#pragma once
+#include <nlohmann/json.hpp>
+
+namespace job_document
+{
+// clang-format off
+
+enum class DataType{
+    Invalid,
+    Boolean,
+    Number,
+    String,
+};
+
+NLOHMANN_JSON_SERIALIZE_ENUM(DataType, {
+    {DataType::Invalid, "Invalid"},
+    {DataType::Boolean, "Boolean"},
+    {DataType::Number, "Number"},
+    {DataType::String, "String"},
+});
+
+}
+// clang-format on
diff --git a/redfish-core/include/generated/enums/job_service.hpp b/redfish-core/include/generated/enums/job_service.hpp
new file mode 100644
index 0000000..2301dd6
--- /dev/null
+++ b/redfish-core/include/generated/enums/job_service.hpp
@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: Copyright OpenBMC Authors
+#pragma once
+#include <nlohmann/json.hpp>
+
+namespace job_service
+{
+// clang-format off
+
+enum class ValidationPolicy{
+    Invalid,
+    Automatic,
+    Manual,
+    Bypass,
+};
+
+NLOHMANN_JSON_SERIALIZE_ENUM(ValidationPolicy, {
+    {ValidationPolicy::Invalid, "Invalid"},
+    {ValidationPolicy::Automatic, "Automatic"},
+    {ValidationPolicy::Manual, "Manual"},
+    {ValidationPolicy::Bypass, "Bypass"},
+});
+
+}
+// clang-format on
diff --git a/redfish-core/include/generated/enums/leak_detector.hpp b/redfish-core/include/generated/enums/leak_detector.hpp
index ba74120..c3bb432 100644
--- a/redfish-core/include/generated/enums/leak_detector.hpp
+++ b/redfish-core/include/generated/enums/leak_detector.hpp
@@ -13,11 +13,25 @@
     FloatSwitch,
 };
 
+enum class ReactionType{
+    Invalid,
+    None,
+    ForceOff,
+    GracefulShutdown,
+};
+
 NLOHMANN_JSON_SERIALIZE_ENUM(LeakDetectorType, {
     {LeakDetectorType::Invalid, "Invalid"},
     {LeakDetectorType::Moisture, "Moisture"},
     {LeakDetectorType::FloatSwitch, "FloatSwitch"},
 });
 
+NLOHMANN_JSON_SERIALIZE_ENUM(ReactionType, {
+    {ReactionType::Invalid, "Invalid"},
+    {ReactionType::None, "None"},
+    {ReactionType::ForceOff, "ForceOff"},
+    {ReactionType::GracefulShutdown, "GracefulShutdown"},
+});
+
 }
 // clang-format on
diff --git a/redfish-core/include/generated/enums/manager.hpp b/redfish-core/include/generated/enums/manager.hpp
index 0f699de..127d5b4 100644
--- a/redfish-core/include/generated/enums/manager.hpp
+++ b/redfish-core/include/generated/enums/manager.hpp
@@ -15,6 +15,7 @@
     RackManager,
     AuxiliaryController,
     Service,
+    FabricManager,
 };
 
 enum class SerialConnectTypesSupported{
@@ -74,6 +75,7 @@
     {ManagerType::RackManager, "RackManager"},
     {ManagerType::AuxiliaryController, "AuxiliaryController"},
     {ManagerType::Service, "Service"},
+    {ManagerType::FabricManager, "FabricManager"},
 });
 
 NLOHMANN_JSON_SERIALIZE_ENUM(SerialConnectTypesSupported, {
diff --git a/redfish-core/include/generated/enums/manager_account.hpp b/redfish-core/include/generated/enums/manager_account.hpp
index 7e9419a..824dc29 100644
--- a/redfish-core/include/generated/enums/manager_account.hpp
+++ b/redfish-core/include/generated/enums/manager_account.hpp
@@ -18,6 +18,7 @@
     KVMIP,
     VirtualMedia,
     WebUI,
+    ControlPanel,
 };
 
 enum class SNMPAuthenticationProtocols{
@@ -51,6 +52,7 @@
     {AccountTypes::KVMIP, "KVMIP"},
     {AccountTypes::VirtualMedia, "VirtualMedia"},
     {AccountTypes::WebUI, "WebUI"},
+    {AccountTypes::ControlPanel, "ControlPanel"},
 });
 
 NLOHMANN_JSON_SERIALIZE_ENUM(SNMPAuthenticationProtocols, {
diff --git a/redfish-core/include/generated/enums/memory.hpp b/redfish-core/include/generated/enums/memory.hpp
index 5098e7c..1edfaab 100644
--- a/redfish-core/include/generated/enums/memory.hpp
+++ b/redfish-core/include/generated/enums/memory.hpp
@@ -53,6 +53,7 @@
     DDR5,
     OEM,
     LPDDR5_SDRAM,
+    DDR5_MRDIMM,
 };
 
 enum class BaseModuleType{
@@ -68,6 +69,7 @@
     SO_DIMM_16b,
     SO_DIMM_32b,
     Die,
+    CAMM,
 };
 
 enum class MemoryMedia{
@@ -156,6 +158,7 @@
     {MemoryDeviceType::DDR5, "DDR5"},
     {MemoryDeviceType::OEM, "OEM"},
     {MemoryDeviceType::LPDDR5_SDRAM, "LPDDR5_SDRAM"},
+    {MemoryDeviceType::DDR5_MRDIMM, "DDR5_MRDIMM"},
 });
 
 NLOHMANN_JSON_SERIALIZE_ENUM(BaseModuleType, {
@@ -171,6 +174,7 @@
     {BaseModuleType::SO_DIMM_16b, "SO_DIMM_16b"},
     {BaseModuleType::SO_DIMM_32b, "SO_DIMM_32b"},
     {BaseModuleType::Die, "Die"},
+    {BaseModuleType::CAMM, "CAMM"},
 });
 
 NLOHMANN_JSON_SERIALIZE_ENUM(MemoryMedia, {
diff --git a/redfish-core/include/generated/enums/protocol.hpp b/redfish-core/include/generated/enums/protocol.hpp
index 30d9b6f..acd7387 100644
--- a/redfish-core/include/generated/enums/protocol.hpp
+++ b/redfish-core/include/generated/enums/protocol.hpp
@@ -50,7 +50,7 @@
     UPI,
     QPI,
     eMMC,
-    UEC,
+    UET,
 };
 
 NLOHMANN_JSON_SERIALIZE_ENUM(Protocol, {
@@ -96,7 +96,7 @@
     {Protocol::UPI, "UPI"},
     {Protocol::QPI, "QPI"},
     {Protocol::eMMC, "eMMC"},
-    {Protocol::UEC, "UEC"},
+    {Protocol::UET, "UET"},
 });
 
 }
diff --git a/redfish-core/include/generated/enums/resource.hpp b/redfish-core/include/generated/enums/resource.hpp
index f13da08..c44ba86 100644
--- a/redfish-core/include/generated/enums/resource.hpp
+++ b/redfish-core/include/generated/enums/resource.hpp
@@ -131,6 +131,13 @@
     RightToLeft,
 };
 
+enum class ConditionType{
+    Invalid,
+    Alert,
+    Informational,
+    Subsystem,
+};
+
 NLOHMANN_JSON_SERIALIZE_ENUM(Id, {
     {Id::Invalid, "Invalid"},
 });
@@ -255,5 +262,12 @@
     {Orientation::RightToLeft, "RightToLeft"},
 });
 
+NLOHMANN_JSON_SERIALIZE_ENUM(ConditionType, {
+    {ConditionType::Invalid, "Invalid"},
+    {ConditionType::Alert, "Alert"},
+    {ConditionType::Informational, "Informational"},
+    {ConditionType::Subsystem, "Subsystem"},
+});
+
 }
 // clang-format on
diff --git a/redfish-core/include/generated/enums/sensor.hpp b/redfish-core/include/generated/enums/sensor.hpp
index 4c99084..c3dbdeb 100644
--- a/redfish-core/include/generated/enums/sensor.hpp
+++ b/redfish-core/include/generated/enums/sensor.hpp
@@ -68,6 +68,13 @@
     Percent,
     AbsoluteHumidity,
     Heat,
+    LinearPosition,
+    LinearVelocity,
+    LinearAcceleration,
+    RotationalPosition,
+    RotationalVelocity,
+    RotationalAcceleration,
+    Valve,
 };
 
 enum class ImplementationType{
@@ -145,6 +152,13 @@
     {ReadingType::Percent, "Percent"},
     {ReadingType::AbsoluteHumidity, "AbsoluteHumidity"},
     {ReadingType::Heat, "Heat"},
+    {ReadingType::LinearPosition, "LinearPosition"},
+    {ReadingType::LinearVelocity, "LinearVelocity"},
+    {ReadingType::LinearAcceleration, "LinearAcceleration"},
+    {ReadingType::RotationalPosition, "RotationalPosition"},
+    {ReadingType::RotationalVelocity, "RotationalVelocity"},
+    {ReadingType::RotationalAcceleration, "RotationalAcceleration"},
+    {ReadingType::Valve, "Valve"},
 });
 
 NLOHMANN_JSON_SERIALIZE_ENUM(ImplementationType, {
diff --git a/redfish-core/include/generated/enums/serial_interface.hpp b/redfish-core/include/generated/enums/serial_interface.hpp
index 7186b91..e4ef53b 100644
--- a/redfish-core/include/generated/enums/serial_interface.hpp
+++ b/redfish-core/include/generated/enums/serial_interface.hpp
@@ -61,6 +61,9 @@
     Cisco,
     Cyclades,
     Digi,
+    Modbus2Wire,
+    Modbus4Wire,
+    ModbusRs232,
 };
 
 enum class ConnectorType{
@@ -76,6 +79,12 @@
     uUSB,
 };
 
+enum class Role{
+    Invalid,
+    Client,
+    Server,
+};
+
 NLOHMANN_JSON_SERIALIZE_ENUM(SignalType, {
     {SignalType::Invalid, "Invalid"},
     {SignalType::Rs232, "Rs232"},
@@ -130,6 +139,9 @@
     {PinOut::Cisco, "Cisco"},
     {PinOut::Cyclades, "Cyclades"},
     {PinOut::Digi, "Digi"},
+    {PinOut::Modbus2Wire, "Modbus2Wire"},
+    {PinOut::Modbus4Wire, "Modbus4Wire"},
+    {PinOut::ModbusRs232, "ModbusRs232"},
 });
 
 NLOHMANN_JSON_SERIALIZE_ENUM(ConnectorType, {
@@ -145,5 +157,11 @@
     {ConnectorType::uUSB, "uUSB"},
 });
 
+NLOHMANN_JSON_SERIALIZE_ENUM(Role, {
+    {Role::Invalid, "Invalid"},
+    {Role::Client, "Client"},
+    {Role::Server, "Server"},
+});
+
 }
 // clang-format on
diff --git a/redfish-core/include/generated/enums/telemetry_data.hpp b/redfish-core/include/generated/enums/telemetry_data.hpp
new file mode 100644
index 0000000..34ee770
--- /dev/null
+++ b/redfish-core/include/generated/enums/telemetry_data.hpp
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: Copyright OpenBMC Authors
+#pragma once
+#include <nlohmann/json.hpp>
+
+namespace telemetry_data
+{
+// clang-format off
+
+enum class TelemetryDataTypes{
+    Invalid,
+    OEM,
+};
+
+NLOHMANN_JSON_SERIALIZE_ENUM(TelemetryDataTypes, {
+    {TelemetryDataTypes::Invalid, "Invalid"},
+    {TelemetryDataTypes::OEM, "OEM"},
+});
+
+}
+// clang-format on
diff --git a/redfish-core/include/generated/enums/virtual_pci2_pci_bridge.hpp b/redfish-core/include/generated/enums/virtual_pci2_pci_bridge.hpp
new file mode 100644
index 0000000..5b447b2
--- /dev/null
+++ b/redfish-core/include/generated/enums/virtual_pci2_pci_bridge.hpp
@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: Copyright OpenBMC Authors
+#pragma once
+#include <nlohmann/json.hpp>
+
+namespace virtual_pci2_pci_bridge
+{
+// clang-format off
+
+enum class vPPBStatusTypes{
+    Invalid,
+    Unbound,
+    Busy,
+    BoundPhysicalPort,
+    BoundLD,
+    BoundPID,
+};
+
+NLOHMANN_JSON_SERIALIZE_ENUM(vPPBStatusTypes, {
+    {vPPBStatusTypes::Invalid, "Invalid"},
+    {vPPBStatusTypes::Unbound, "Unbound"},
+    {vPPBStatusTypes::Busy, "Busy"},
+    {vPPBStatusTypes::BoundPhysicalPort, "BoundPhysicalPort"},
+    {vPPBStatusTypes::BoundLD, "BoundLD"},
+    {vPPBStatusTypes::BoundPID, "BoundPID"},
+});
+
+}
+// clang-format on
diff --git a/redfish-core/schema/dmtf/csdl/AggregationSource_v1.xml b/redfish-core/schema/dmtf/csdl/AggregationSource_v1.xml
index a9c07ef..05117e4 100644
--- a/redfish-core/schema/dmtf/csdl/AggregationSource_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/AggregationSource_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  AggregationSource v1.4.3                                            -->
+<!--# Redfish Schema:  AggregationSource v1.5.0                                            -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -526,5 +526,24 @@
       <EntityType Name="AggregationSource" BaseType="AggregationSource.v1_4_2.AggregationSource"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AggregationSource.v1_5_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2025.2"/>
+
+      <EntityType Name="AggregationSource" BaseType="AggregationSource.v1_4_3.AggregationSource">
+        <Property Name="ModbusTargetServerId" Type="Edm.Int64">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="The Modbus identifier of this aggregation source."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the Modbus identifier of this aggregation source."/>
+        </Property>
+        <Property Name="Port" Type="Edm.Int64">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="The network port."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the network port used to connect to this aggregation source."/>
+          <Annotation Term="Validation.Minimum" Int="0"/>
+        </Property>
+      </EntityType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/Assembly_v1.xml b/redfish-core/schema/dmtf/csdl/Assembly_v1.xml
index dccb37a..67e32a6 100644
--- a/redfish-core/schema/dmtf/csdl/Assembly_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/Assembly_v1.xml
@@ -113,12 +113,15 @@
             <String>/redfish/v1/ThermalEquipment/CDUs/{CoolingUnitId}/Assembly</String>
             <String>/redfish/v1/ThermalEquipment/ImmersionUnits/{CoolingUnitId}/Assembly</String>
             <String>/redfish/v1/ThermalEquipment/HeatExchangers/{CoolingUnitId}/Assembly</String>
+            <String>/redfish/v1/ThermalEquipment/RPUs/{CoolingUnitId}/Assembly</String>
             <String>/redfish/v1/ThermalEquipment/CDUs/{CoolingUnitId}/Reservoirs/{ReservoirId}/Assembly</String>
             <String>/redfish/v1/ThermalEquipment/ImmersionUnits/{CoolingUnitId}/Reservoirs/{ReservoirId}/Assembly</String>
             <String>/redfish/v1/ThermalEquipment/HeatExchangers/{CoolingUnitId}/Reservoirs/{ReservoirId}/Assembly</String>
+            <String>/redfish/v1/ThermalEquipment/RPUs/{CoolingUnitId}/Reservoirs/{ReservoirId}/Assembly</String>
             <String>/redfish/v1/ThermalEquipment/CDUs/{CoolingUnitId}/Pumps/{PumpId}/Assembly</String>
             <String>/redfish/v1/ThermalEquipment/ImmersionUnits/{CoolingUnitId}/Pumps/{PumpId}/Assembly</String>
             <String>/redfish/v1/ThermalEquipment/HeatExchangers/{CoolingUnitId}/Pumps/{PumpId}/Assembly</String>
+            <String>/redfish/v1/ThermalEquipment/RPUs/{CoolingUnitId}/Pumps/{PumpId}/Assembly</String>
             <String>/redfish/v1/ThermalEquipment/CDUs/{CoolingUnitId}/Filters/{FilterId}/Assembly</String>
             <String>/redfish/v1/ThermalEquipment/CDUs/{CoolingUnitId}/Reservoirs/{ReservoirId}/Filters/{FilterId}/Assembly</String>
             <String>/redfish/v1/ThermalEquipment/CDUs/{CoolingUnitId}/Pumps/{PumpId}/Filters/{FilterId}/Assembly</String>
@@ -128,6 +131,18 @@
             <String>/redfish/v1/ThermalEquipment/HeatExchangers/{CoolingUnitId}/Filters/{FilterId}/Assembly</String>
             <String>/redfish/v1/ThermalEquipment/HeatExchangers/{CoolingUnitId}/Reservoirs/{ReservoirId}/Filters/{FilterId}/Assembly</String>
             <String>/redfish/v1/ThermalEquipment/HeatExchangers/{CoolingUnitId}/Pumps/{PumpId}/Filters/{FilterId}/Assembly</String>
+            <String>/redfish/v1/ThermalEquipment/RPUs/{CoolingUnitId}/Filters/{FilterId}/Assembly</String>
+            <String>/redfish/v1/ThermalEquipment/RPUs/{CoolingUnitId}/Reservoirs/{ReservoirId}/Filters/{FilterId}/Assembly</String>
+            <String>/redfish/v1/ThermalEquipment/RPUs/{CoolingUnitId}/Pumps/{PumpId}/Filters/{FilterId}/Assembly</String>
+          </Collection>
+        </Annotation>
+        <Annotation Term="Redfish.DeprecatedUris">
+          <Collection>
+            <String>/redfish/v1/Systems/{ComputerSystemId}/Storage/{StorageId}/Drives/{DriveId}/Assembly</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/Drives/{DriveId}/Assembly</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/Drives/{DriveId}/Assembly</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/Drives/{DriveId}/Assembly</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/Drives/{DriveId}/Assembly</String>
           </Collection>
         </Annotation>
       </EntityType>
diff --git a/redfish-core/schema/dmtf/csdl/AutomationInstrumentation_v1.xml b/redfish-core/schema/dmtf/csdl/AutomationInstrumentation_v1.xml
new file mode 100644
index 0000000..fdc03fc
--- /dev/null
+++ b/redfish-core/schema/dmtf/csdl/AutomationInstrumentation_v1.xml
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!---->
+<!--################################################################################       -->
+<!--# Redfish Schema:  AutomationInstrumentation v1.0.0                                    -->
+<!--#                                                                                      -->
+<!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
+<!--# available at http://www.dmtf.org/standards/redfish                                   -->
+<!--# Copyright 2014-2025 DMTF.                                                                 -->
+<!--# For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright -->
+<!--################################################################################       -->
+<!---->
+<edmx:Edmx xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx" Version="4.0">
+
+  <edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Core.V1.xml">
+    <edmx:Include Namespace="Org.OData.Core.V1" Alias="OData"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Capabilities.V1.xml">
+    <edmx:Include Namespace="Org.OData.Capabilities.V1" Alias="Capabilities"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/RedfishExtensions_v1.xml">
+    <edmx:Include Namespace="RedfishExtensions.v1_0_0" Alias="Redfish"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Resource_v1.xml">
+    <edmx:Include Namespace="Resource"/>
+    <edmx:Include Namespace="Resource.v1_0_0"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Sensor_v1.xml">
+    <edmx:Include Namespace="Sensor"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Control_v1.xml">
+    <edmx:Include Namespace="Control"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/AutomationNode_v1.xml">
+    <edmx:Include Namespace="AutomationNode"/>
+  </edmx:Reference>
+
+  <edmx:DataServices>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AutomationInstrumentation">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+
+      <EntityType Name="AutomationInstrumentation" BaseType="Resource.v1_0_0.Resource" Abstract="true">
+        <Annotation Term="OData.Description" String="The `AutomationInstrumentation` schema contains measurements and set points for an automation node."/>
+        <Annotation Term="OData.LongDescription" String="This resource shall represent automation node instrumentation for a Redfish implementation."/>
+        <Annotation Term="Capabilities.InsertRestrictions">
+          <Record>
+            <PropertyValue Property="Insertable" Bool="false"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Capabilities.UpdateRestrictions">
+          <Record>
+            <PropertyValue Property="Updatable" Bool="true"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Capabilities.DeleteRestrictions">
+          <Record>
+            <PropertyValue Property="Deletable" Bool="false"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Redfish.Uris">
+          <Collection>
+            <String>/redfish/v1/AutomationNodes/{AutomationNodeId}/AutomationInstrumentation</String>
+          </Collection>
+        </Annotation>
+      </EntityType>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AutomationInstrumentation.v1_0_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2025.2"/>
+
+      <EntityType Name="AutomationInstrumentation" BaseType="AutomationInstrumentation.AutomationInstrumentation">
+        <Property Name="NodeState" Type="AutomationNode.NodeState" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The current state of the node."/>
+          <Annotation Term="OData.LongDescription" String="This parameter shall specify the current state of the automation node."/>
+        </Property>
+        <Property Name="Status" Type="Resource.Status" Nullable="false">
+          <Annotation Term="OData.Description" String="The status and health of a resource and its children."/>
+          <Annotation Term="OData.LongDescription" String="This type shall contain any status or health properties of a resource."/>
+        </Property>
+        <NavigationProperty Name="PID" Type="Control.Control">
+          <Annotation Term="Redfish.ExcerptCopy" String="SingleLoop"/>
+          <Annotation Term="OData.Description" String="A PID control loop."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a PID-based control loop for this resource.  The value of the `DataSourceUri` property, if present, shall reference a resource of type `Control`."/>
+        </NavigationProperty>
+        <NavigationProperty Name="NodeControl" Type="Control.Control">
+          <Annotation Term="Redfish.ExcerptCopy" String="Node"/>
+          <Annotation Term="OData.Description" String="The control for this node."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the control for this resource.  The value of the `DataSourceUri` property, if present, shall reference a resource of type `Control`."/>
+        </NavigationProperty>
+        <NavigationProperty Name="TemperatureCelsius" Type="Sensor.Sensor">
+          <Annotation Term="Redfish.ExcerptCopy"/>
+          <Annotation Term="OData.Description" String="Temperature (Celsius)."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the temperature, in degree Celsius units, for this resource.  The value of the `DataSourceUri` property, if present, shall reference a resource of type `Sensor` with the `ReadingType` property containing the value `Temperature`."/>
+        </NavigationProperty>
+        <NavigationProperty Name="Voltage" Type="Sensor.Sensor">
+          <Annotation Term="Redfish.ExcerptCopy" String="Voltage"/>
+          <Annotation Term="OData.Description" String="The voltage (V) for this node."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the voltage, in volt units, for this automation node.  The value of the `DataSourceUri` property, if present, shall reference a resource of type `Sensor` with the `ReadingType` property containing the value `Voltage`."/>
+        </NavigationProperty>
+        <NavigationProperty Name="CurrentAmps" Type="Sensor.Sensor">
+          <Annotation Term="Redfish.ExcerptCopy" String="Current"/>
+          <Annotation Term="OData.Description" String="The current (A) for this node."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the current, in ampere units, for this automation node.  The value of the `DataSourceUri` property, if present, shall reference a resource of type `Sensor` with the `ReadingType` property containing the value `Current`."/>
+        </NavigationProperty>
+        <Property Name="Actions" Type="AutomationInstrumentation.v1_0_0.Actions" Nullable="false">
+          <Annotation Term="OData.Description" String="The available actions for this resource."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the available actions for this resource."/>
+        </Property>
+      </EntityType>
+
+      <ComplexType Name="Actions">
+        <Annotation Term="OData.AdditionalProperties" Bool="false"/>
+        <Annotation Term="OData.Description" String="The available actions for this resource."/>
+        <Annotation Term="OData.LongDescription" String="This type shall contain the available actions for this resource."/>
+        <Property Name="Oem" Type="AutomationInstrumentation.v1_0_0.OemActions" Nullable="false">
+          <Annotation Term="OData.Description" String="The available OEM-specific actions for this resource."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the available OEM-specific actions for this resource."/>
+        </Property>
+      </ComplexType>
+
+      <ComplexType Name="OemActions">
+        <Annotation Term="OData.AdditionalProperties" Bool="true"/>
+        <Annotation Term="OData.Description" String="The available OEM-specific actions for this resource."/>
+        <Annotation Term="OData.LongDescription" String="This type shall contain the available OEM-specific actions for this resource."/>
+      </ComplexType>
+    </Schema>
+
+  </edmx:DataServices>
+</edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/AutomationNodeCollection_v1.xml b/redfish-core/schema/dmtf/csdl/AutomationNodeCollection_v1.xml
new file mode 100644
index 0000000..6d98cf8
--- /dev/null
+++ b/redfish-core/schema/dmtf/csdl/AutomationNodeCollection_v1.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!---->
+<!--################################################################################       -->
+<!--# Redfish Schema:  AutomationNodeCollection                                            -->
+<!--#                                                                                      -->
+<!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
+<!--# available at http://www.dmtf.org/standards/redfish                                   -->
+<!--# Copyright 2014-2025 DMTF.                                                            -->
+<!--# For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright -->
+<!--################################################################################       -->
+<!---->
+<edmx:Edmx xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx" Version="4.0">
+
+  <edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Core.V1.xml">
+    <edmx:Include Namespace="Org.OData.Core.V1" Alias="OData"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Capabilities.V1.xml">
+    <edmx:Include Namespace="Org.OData.Capabilities.V1" Alias="Capabilities"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Resource_v1.xml">
+    <edmx:Include Namespace="Resource.v1_0_0"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/RedfishExtensions_v1.xml">
+    <edmx:Include Namespace="RedfishExtensions.v1_0_0" Alias="Redfish"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/AutomationNode_v1.xml">
+    <edmx:Include Namespace="AutomationNode"/>
+  </edmx:Reference>
+
+  <edmx:DataServices>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AutomationNodeCollection">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Language" String="en"/>
+
+      <EntityType Name="AutomationNodeCollection" BaseType="Resource.v1_0_0.ResourceCollection">
+        <Annotation Term="OData.Description" String="The collection of `AutomationNode` resource instances."/>
+        <Annotation Term="OData.LongDescription" String="This resource shall represent a resource collection of `AutomationNode` instances for a Redfish implementation."/>
+        <Annotation Term="Capabilities.InsertRestrictions">
+          <Record>
+            <PropertyValue Property="Insertable" Bool="false"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Capabilities.UpdateRestrictions">
+          <Record>
+            <PropertyValue Property="Updatable" Bool="false"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Capabilities.DeleteRestrictions">
+          <Record>
+            <PropertyValue Property="Deletable" Bool="false"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Redfish.Uris">
+          <Collection>
+            <String>/redfish/v1/AutomationNodes</String>
+          </Collection>
+        </Annotation>
+        <NavigationProperty Name="Members" Type="Collection(AutomationNode.AutomationNode)">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The members of this collection."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an array of links to the members of this collection."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+          <Annotation Term="Redfish.Required"/>
+        </NavigationProperty>
+      </EntityType>
+    </Schema>
+
+  </edmx:DataServices>
+</edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/AutomationNode_v1.xml b/redfish-core/schema/dmtf/csdl/AutomationNode_v1.xml
new file mode 100644
index 0000000..a85b3e6
--- /dev/null
+++ b/redfish-core/schema/dmtf/csdl/AutomationNode_v1.xml
@@ -0,0 +1,266 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!---->
+<!--################################################################################       -->
+<!--# Redfish Schema:  AutomationNode v1.0.0                                               -->
+<!--#                                                                                      -->
+<!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
+<!--# available at http://www.dmtf.org/standards/redfish                                   -->
+<!--# Copyright 2014-2025 DMTF.                                                                 -->
+<!--# For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright -->
+<!--################################################################################       -->
+<!---->
+<edmx:Edmx xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx" Version="4.0">
+
+  <edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Core.V1.xml">
+    <edmx:Include Namespace="Org.OData.Core.V1" Alias="OData"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Capabilities.V1.xml">
+    <edmx:Include Namespace="Org.OData.Capabilities.V1" Alias="Capabilities"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/RedfishExtensions_v1.xml">
+    <edmx:Include Namespace="RedfishExtensions.v1_0_0" Alias="Redfish"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Resource_v1.xml">
+    <edmx:Include Namespace="Resource"/>
+    <edmx:Include Namespace="Resource.v1_0_0"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Sensor_v1.xml">
+    <edmx:Include Namespace="Sensor"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Control_v1.xml">
+    <edmx:Include Namespace="Control"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Chassis_v1.xml">
+    <edmx:Include Namespace="Chassis"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/AutomationInstrumentation_v1.xml">
+    <edmx:Include Namespace="AutomationInstrumentation"/>
+  </edmx:Reference>
+
+  <edmx:DataServices>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AutomationNode">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+
+      <EntityType Name="AutomationNode" BaseType="Resource.v1_0_0.Resource" Abstract="true">
+        <Annotation Term="OData.Description" String="The `AutomationNode` schema describes a node that carries out instructions in industrial automation environments."/>
+        <Annotation Term="OData.LongDescription" String="This resource shall represent an automation node for a Redfish implementation."/>
+        <Annotation Term="Capabilities.InsertRestrictions">
+          <Record>
+            <PropertyValue Property="Insertable" Bool="false"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Capabilities.UpdateRestrictions">
+          <Record>
+            <PropertyValue Property="Updatable" Bool="true"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Capabilities.DeleteRestrictions">
+          <Record>
+            <PropertyValue Property="Deletable" Bool="false"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Redfish.Uris">
+          <Collection>
+            <String>/redfish/v1/AutomationNodes/{AutomationNodeId}</String>
+          </Collection>
+        </Annotation>
+      </EntityType>
+
+      <EnumType Name="NodeState">
+        <Member Name="Idle">
+          <Annotation Term="OData.Description" String="The node's controller is idle."/>
+        </Member>
+        <Member Name="Done">
+          <Annotation Term="OData.Description" String="The node's controller has reached its destination position."/>
+        </Member>
+        <Member Name="Waiting">
+          <Annotation Term="OData.Description" String="The node's controller is waiting to start."/>
+        </Member>
+        <Member Name="ConditionStop">
+          <Annotation Term="OData.Description" String="The node's controller has stopped due to a condition fault."/>
+        </Member>
+        <Member Name="ErrorStop">
+          <Annotation Term="OData.Description" String="The node's controller has stopped due to an error."/>
+        </Member>
+        <Member Name="Running">
+          <Annotation Term="OData.Description" String="The node's controller is running."/>
+        </Member>
+      </EnumType>
+
+      <Action Name="Start" IsBound="true">
+        <Annotation Term="OData.Description" String="Starts the node."/>
+        <Annotation Term="OData.LongDescription" String="This action shall transition the node to the `Running` state.  This action shall pulse the trigger signal to other connected nodes that are in the `Waiting` state."/>
+        <Parameter Name="AutomationNode" Type="AutomationNode.v1_0_0.Actions"/>
+      </Action>
+      <Action Name="Wait" IsBound="true">
+        <Annotation Term="OData.Description" String="Signals the node to wait for the next instruction."/>
+        <Annotation Term="OData.LongDescription" String="This action shall transition the node to the `Waiting` state."/>
+        <Parameter Name="AutomationNode" Type="AutomationNode.v1_0_0.Actions"/>
+      </Action>
+      <Action Name="Stop" IsBound="true">
+        <Annotation Term="OData.Description" String="Stops the node."/>
+        <Annotation Term="OData.LongDescription" String="This action shall transition the node to the `Idle` state."/>
+        <Parameter Name="AutomationNode" Type="AutomationNode.v1_0_0.Actions"/>
+      </Action>
+      <Action Name="SendTrigger" IsBound="true">
+        <Annotation Term="OData.Description" String="Sends a trigger to the node."/>
+        <Annotation Term="OData.LongDescription" String="This action shall pulse the trigger signal for the node."/>
+        <Parameter Name="AutomationNode" Type="AutomationNode.v1_0_0.Actions"/>
+      </Action>
+      <Action Name="Reset" IsBound="true">
+        <Annotation Term="OData.Description" String="Resets the node."/>
+        <Annotation Term="OData.LongDescription" String="This action shall reset the node to its power-on state."/>
+        <Parameter Name="AutomationNode" Type="AutomationNode.v1_0_0.Actions"/>
+      </Action>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AutomationNode.v1_0_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2025.2"/>
+
+      <EntityType Name="AutomationNode" BaseType="AutomationNode.AutomationNode">
+        <Property Name="NodeType" Type="AutomationNode.v1_0_0.NodeType" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The type of automation node."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the type for the automation node."/>
+        </Property>
+        <Property Name="NodeState" Type="AutomationNode.NodeState" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The current state of the node."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the current state of the automation node."/>
+        </Property>
+        <Property Name="MotionProfile" Type="AutomationNode.v1_0_0.MotionProfileType">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="The motion profile type used for this node."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the type of motion profile used for this motion-based node."/>
+        </Property>
+        <Property Name="MotionAxis" Type="AutomationNode.v1_0_0.MotionAxisType">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="The primary axis of motion for this motion-related node."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the primary axis of motion for this motion-related node."/>
+        </Property>
+        <NavigationProperty Name="Instrumentation" Type="AutomationInstrumentation.AutomationInstrumentation" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="A link to the instrumentation for this node."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource of type `AutomationInstrumentation` that represents the instrumentation for this automation node."/>
+        </NavigationProperty>
+        <Property Name="Status" Type="Resource.Status" Nullable="false">
+          <Annotation Term="OData.Description" String="The status and health of a resource and its children."/>
+          <Annotation Term="OData.LongDescription" String="This type shall contain any status or health properties of a resource."/>
+        </Property>
+        <Property Name="Links" Type="AutomationNode.v1_0_0.Links" Nullable="false">
+          <Annotation Term="OData.Description" String="The links to other resources that are related to this resource."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain links to resources that are related to but are not contained by, or subordinate to, this resource."/>
+        </Property>
+        <Property Name="Actions" Type="AutomationNode.v1_0_0.Actions" Nullable="false">
+          <Annotation Term="OData.Description" String="The available actions for this resource."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the available actions for this resource."/>
+        </Property>
+      </EntityType>
+
+      <ComplexType Name="Actions">
+        <Annotation Term="OData.AdditionalProperties" Bool="false"/>
+        <Annotation Term="OData.Description" String="The available actions for this resource."/>
+        <Annotation Term="OData.LongDescription" String="This type shall contain the available actions for this resource."/>
+        <Property Name="Oem" Type="AutomationNode.v1_0_0.OemActions" Nullable="false">
+          <Annotation Term="OData.Description" String="The available OEM-specific actions for this resource."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the available OEM-specific actions for this resource."/>
+        </Property>
+      </ComplexType>
+
+      <ComplexType Name="OemActions">
+        <Annotation Term="OData.AdditionalProperties" Bool="true"/>
+        <Annotation Term="OData.Description" String="The available OEM-specific actions for this resource."/>
+        <Annotation Term="OData.LongDescription" String="This type shall contain the available OEM-specific actions for this resource."/>
+      </ComplexType>
+
+      <EnumType Name="NodeType">
+        <Member Name="MotionPosition">
+          <Annotation Term="OData.Description" String="A position-based profiled motion node where position, velocity, and acceleration are all controlled."/>
+        </Member>
+        <Member Name="MotionVelocity">
+          <Annotation Term="OData.Description" String="A velocity-based profiled motion node where position, velocity and acceleration are all controlled."/>
+        </Member>
+        <Member Name="MotionPositionGroup">
+          <Annotation Term="OData.Description" String="A multi-axis position-based profiled motion node where position, velocity and acceleration are all controlled."/>
+        </Member>
+        <Member Name="PID">
+          <Annotation Term="OData.Description" String="A node that attempts to match a set point using a PID control algorithm."/>
+        </Member>
+        <Member Name="Simple">
+          <Annotation Term="OData.Description" String="A simple node that incorporates no automated control function."/>
+        </Member>
+      </EnumType>
+
+      <EnumType Name="MotionProfileType">
+        <Member Name="Trapezoidal">
+          <Annotation Term="OData.Description" String="Trapezoidal profile."/>
+        </Member>
+        <Member Name="SCurve">
+          <Annotation Term="OData.Description" String="S-curve profile."/>
+        </Member>
+        <Member Name="None">
+          <Annotation Term="OData.Description" String="No profile specified."/>
+        </Member>
+      </EnumType>
+
+      <EnumType Name="MotionAxisType">
+        <Member Name="X">
+          <Annotation Term="OData.Description" String="X axis."/>
+        </Member>
+        <Member Name="Y">
+          <Annotation Term="OData.Description" String="Y axis."/>
+        </Member>
+        <Member Name="Z">
+          <Annotation Term="OData.Description" String="Z axis."/>
+        </Member>
+        <Member Name="TwoAxis">
+          <Annotation Term="OData.Description" String="2-axis."/>
+        </Member>
+        <Member Name="ThreeAxis">
+          <Annotation Term="OData.Description" String="3-axis."/>
+        </Member>
+      </EnumType>
+
+      <ComplexType Name="Links" BaseType="Resource.Links">
+        <Annotation Term="OData.Description" String="The links to other resources that are related to this resource."/>
+        <Annotation Term="OData.LongDescription" String="This Redfish Specification-described type shall contain links to resources that are related to but are not contained by, or subordinate to, this resource."/>
+        <Annotation Term="OData.AdditionalProperties" Bool="false"/>
+        <NavigationProperty Name="Chassis" Type="Collection(Chassis.Chassis)">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="An array of links to the chassis that contain this equipment."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an array of links to resources of type `Chassis` that represent the physical containers that contain this equipment."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+        <NavigationProperty Name="AutomationNodeGroup" Type="Collection(AutomationNode.AutomationNode)">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="An array of links to the automation nodes that are included in an automation node group."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an array of links to resources of type `AutomationNode` that represent the nodes that provide the functionality of this group."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+        <NavigationProperty Name="PositionSensor" Type="Sensor.Sensor" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="A link to the position sensor."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource of type `Sensor` that represents the position sensor associated with this node."/>
+        </NavigationProperty>
+        <NavigationProperty Name="VelocitySensor" Type="Sensor.Sensor" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="A link to the velocity sensor."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource of type `Sensor` that represents the velocity sensor associated with this node."/>
+        </NavigationProperty>
+        <NavigationProperty Name="PidFeedbackSensor" Type="Sensor.Sensor" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="A link to the PID feedback sensor."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource of type `Sensor` that represents the feedback sensor associated with this node.  The feedback sensor is intended to return controlled value output in a PID system."/>
+        </NavigationProperty>
+        <NavigationProperty Name="OutputControl" Type="Control.Control" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="A link to the output control."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource of type `Control` that represent the output control associated with this node."/>
+        </NavigationProperty>
+      </ComplexType>
+    </Schema>
+
+  </edmx:DataServices>
+</edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/Battery_v1.xml b/redfish-core/schema/dmtf/csdl/Battery_v1.xml
index a0a5b4c..951896e 100644
--- a/redfish-core/schema/dmtf/csdl/Battery_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/Battery_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  Battery v1.3.0                                                      -->
+<!--# Redfish Schema:  Battery v1.4.0                                                      -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -51,8 +51,8 @@
       <Annotation Term="Redfish.Language" String="en"/>
 
       <EntityType Name="Battery" BaseType="Resource.v1_0_0.Resource" Abstract="true">
-        <Annotation Term="OData.Description" String="The `Battery` schema describes a battery unit, such as those used to provide systems with power during a power-loss event.  It also describes the location, such as a slot, socket, or bay, where a unit can be installed by populating a resource instance with an absent state if a unit is not present."/>
-        <Annotation Term="OData.LongDescription" String="This resource shall represent a battery for a Redfish implementation.  It may also represent a location, such as a slot, socket, or bay, where a unit may be installed if the `State` property within the `Status` property contains `Absent`."/>
+        <Annotation Term="OData.Description" String="The `Battery` schema describes a unit of energy storage, including batteries and supercapacitors, used to provide systems or components within a system with power during a power-loss event or to store energy for later use.  It also describes the location, such as a slot, socket, or bay, where a unit can be installed by populating a resource instance with an absent state if a unit is not present."/>
+        <Annotation Term="OData.LongDescription" String="This resource shall represent an energy storage device for a Redfish implementation.  It may also represent a location, such as a slot, socket, or bay, where a unit may be installed if the `State` property within the `Status` property contains `Absent`."/>
         <Annotation Term="Capabilities.InsertRestrictions">
           <Record>
             <PropertyValue Property="Insertable" Bool="false"/>
@@ -294,6 +294,12 @@
       <EntityType Name="Battery" BaseType="Battery.v1_0_3.Battery"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Battery.v1_0_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the resource description to broaden the scope of a `Battery` resource to any energy storage device, such as supercapacitors."/>
+      <EntityType Name="Battery" BaseType="Battery.v1_0_4.Battery"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Battery.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2021.2"/>
@@ -341,6 +347,12 @@
       <EntityType Name="Battery" BaseType="Battery.v1_1_2.Battery"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Battery.v1_1_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the resource description to broaden the scope of a `Battery` resource to any energy storage device, such as supercapacitors."/>
+      <EntityType Name="Battery" BaseType="Battery.v1_1_3.Battery"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Battery.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2022.2"/>
@@ -372,6 +384,12 @@
       <EntityType Name="Battery" BaseType="Battery.v1_2_2.Battery"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Battery.v1_2_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the resource description to broaden the scope of a `Battery` resource to any energy storage device, such as supercapacitors."/>
+      <EntityType Name="Battery" BaseType="Battery.v1_2_3.Battery"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Battery.v1_3_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2024.1"/>
@@ -387,5 +405,55 @@
       </EntityType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Battery.v1_3_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the resource description to broaden the scope of a `Battery` resource to any energy storage device, such as supercapacitors."/>
+      <EntityType Name="Battery" BaseType="Battery.v1_3_0.Battery"/>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Battery.v1_4_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2025.2"/>
+
+      <EntityType Name="Battery" BaseType="Battery.v1_3_1.Battery">
+        <Property Name="BatteryChemistryType" Type="Battery.v1_4_0.BatteryChemistryType">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The chemistry of the battery."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the chemistry of the battery.  This property shall only be present if the `EnergyStorageType` property contains `Battery`."/>
+        </Property>
+        <Property Name="EnergyStorageType" Type="Battery.v1_4_0.EnergyStorageType">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The type of energy storage technology used in the battery."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the energy storage technology used in the battery."/>
+        </Property>
+      </EntityType>
+
+      <EnumType Name="BatteryChemistryType">
+        <Member Name="LeadAcid">
+          <Annotation Term="OData.Description" String="Chemical energy stored through lead and acid electrochemical reactions."/>
+          <Annotation Term="OData.LongDescription" String="The value shall indicate that the battery stores chemical energy using lead and acid electrochemical reactions."/>
+        </Member>
+        <Member Name="LithiumIon">
+          <Annotation Term="OData.Description" String="Chemical energy stored through lithium ion intercalation reactions."/>
+          <Annotation Term="OData.LongDescription" String="The value shall indicate that the battery stores chemical energy using lithium ion intercalation."/>
+        </Member>
+        <Member Name="NickelCadmium">
+          <Annotation Term="OData.Description" String="Chemical energy stored through nickel and cadmium electrochemical reactions."/>
+          <Annotation Term="OData.LongDescription" String="The value shall indicate that the battery stores chemical energy using nickel and cadmium electrochemical reactions."/>
+        </Member>
+      </EnumType>
+
+      <EnumType Name="EnergyStorageType">
+        <Member Name="Battery">
+          <Annotation Term="OData.Description" String="Energy stored through one or more electrochemical cells."/>
+          <Annotation Term="OData.LongDescription" String="The value shall indicate that the battery stores energy using one or more electrochemical cells."/>
+        </Member>
+        <Member Name="Supercapacitor">
+          <Annotation Term="OData.Description" String="Energy stored through electrostatic double-layer capacitors or electrodes with electrochemical pseudocapacitance."/>
+          <Annotation Term="OData.LongDescription" String="The value shall indicate that the battery stores energy using electrostatic double-layer capacitors or electrodes with electrochemical pseudocapacitance."/>
+        </Member>
+      </EnumType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/CertificateCollection_v1.xml b/redfish-core/schema/dmtf/csdl/CertificateCollection_v1.xml
index 9f8ce84..d7bfe72 100644
--- a/redfish-core/schema/dmtf/csdl/CertificateCollection_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/CertificateCollection_v1.xml
@@ -136,6 +136,15 @@
             <String>/redfish/v1/Chassis/{ChassisId}/PowerSubsystem/PowerSupplies/{PowerSupplyId}/Certificates</String>
           </Collection>
         </Annotation>
+        <Annotation Term="Redfish.DeprecatedUris">
+          <Collection>
+            <String>/redfish/v1/Systems/{ComputerSystemId}/Storage/{StorageId}/Drives/{DriveId}/Certificates</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/Drives/{DriveId}/Certificates</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/Drives/{DriveId}/Certificates</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/Drives/{DriveId}/Certificates</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/Drives/{DriveId}/Certificates</String>
+          </Collection>
+        </Annotation>
         <NavigationProperty Name="Members" Type="Collection(Certificate.Certificate)">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The members of this collection."/>
diff --git a/redfish-core/schema/dmtf/csdl/CertificateService_v1.xml b/redfish-core/schema/dmtf/csdl/CertificateService_v1.xml
index f5387b9..0638bde 100644
--- a/redfish-core/schema/dmtf/csdl/CertificateService_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/CertificateService_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  CertificateService v1.0.6                                           -->
+<!--# Redfish Schema:  CertificateService v1.1.0                                           -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -163,6 +163,18 @@
           <Annotation Term="OData.Description" String="The link to the certificate that is being replaced."/>
           <Annotation Term="OData.LongDescription" String="This parameter shall contain a link to a resource of type `Certificate` that is being replaced."/>
         </Parameter>
+        <Parameter Name="Password" Type="Edm.String">
+          <Annotation Term="OData.Description" String="The password for the certificate."/>
+          <Annotation Term="OData.LongDescription" String="This parameter shall contain the password for the certificate contained in the `CertificateString` parameter.  This parameter shall be required if the `CertificateType` parameter contains `PKCS12` and the client-provided certificate is password protected."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_1_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Parameter>
       </Action>
     </Schema>
 
@@ -254,5 +266,13 @@
       <EntityType Name="CertificateService" BaseType="CertificateService.v1_0_5.CertificateService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="CertificateService.v1_1_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2025.1"/>
+      <Annotation Term="OData.Description" String="This version was created to add `Password` to `ReplaceCertificate`."/>
+
+      <EntityType Name="CertificateService" BaseType="CertificateService.v1_0_6.CertificateService"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/Certificate_v1.xml b/redfish-core/schema/dmtf/csdl/Certificate_v1.xml
index 29c5e37..9edcbea 100644
--- a/redfish-core/schema/dmtf/csdl/Certificate_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/Certificate_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  Certificate v1.9.0                                                  -->
+<!--# Redfish Schema:  Certificate v1.10.0                                                 -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -135,6 +135,15 @@
             <String>/redfish/v1/Chassis/{ChassisId}/PowerSubsystem/PowerSupplies/{PowerSupplyId}/Certificates/{CertificateId}</String>
           </Collection>
         </Annotation>
+        <Annotation Term="Redfish.DeprecatedUris">
+          <Collection>
+            <String>/redfish/v1/Systems/{ComputerSystemId}/Storage/{StorageId}/Drives/{DriveId}/Certificates/{CertificateId}</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/Drives/{DriveId}/Certificates/{CertificateId}</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/Drives/{DriveId}/Certificates/{CertificateId}</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/Drives/{DriveId}/Certificates/{CertificateId}</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/Drives/{DriveId}/Certificates/{CertificateId}</String>
+          </Collection>
+        </Annotation>
       </EntityType>
 
       <EnumType Name="CertificateType">
@@ -144,7 +153,7 @@
         </Member>
         <Member Name="PEMchain">
           <Annotation Term="OData.Description" String="A Privacy Enhanced Mail (PEM)-encoded certificate chain."/>
-          <Annotation Term="OData.LongDescription" String="This value shall indicate the format of the certificate shall contain a Privacy Enhanced Mail (PEM)-encoded string, containing RFC5280-defined structures, representing a certificate chain."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the format of the certificate shall contain a Privacy Enhanced Mail (PEM)-encoded string, containing RFC5280-defined structures, representing a certificate chain.  When this value is specified, the properties of the resource, except for `CertificateString`, shall contain the information from the leaf certificate.  When this value is specified, `CertificateString` shall contain the entire PEM chain."/>
           <Annotation Term="Redfish.Revisions">
             <Collection>
               <Record>
@@ -156,7 +165,19 @@
         </Member>
         <Member Name="PKCS7">
           <Annotation Term="OData.Description" String="A Privacy Enhanced Mail (PEM)-encoded PKCS7 certificate."/>
-          <Annotation Term="OData.LongDescription" String="The format of the certificate shall contain a Privacy Enhanced Mail (PEM)-encoded string, containing RFC5280-defined and RFC2315-defined structures.  The service can discard additional certificates or other data in the structure."/>
+          <Annotation Term="OData.LongDescription" String="The format of the certificate shall contain a Privacy Enhanced Mail (PEM)-encoded string, containing RFC5280-defined and RFC2315-defined structures.  The service may discard additional certificates or other data in the structure."/>
+        </Member>
+        <Member Name="PKCS12">
+          <Annotation Term="OData.Description" String="A Base64-encoded PKCS12 certificate bundle."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the format of the certificate shall contain a Base64-encoded string, with padding characters, containing RFC7292-defined structures, representing a PKCS12 archive of one or more certificates, keys, or other cryptographic data.  The service may discard additional certificates or other data in the structure."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_10_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
         </Member>
       </EnumType>
 
@@ -743,6 +764,12 @@
       <EntityType Name="Certificate" BaseType="Certificate.v1_4_3.Certificate"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Certificate.v1_4_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify that `PEMChain` certificates contain leaf certificate information in the properties for the resource."/>
+      <EntityType Name="Certificate" BaseType="Certificate.v1_4_4.Certificate"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Certificate.v1_5_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2021.3"/>
@@ -790,6 +817,12 @@
       <EntityType Name="Certificate" BaseType="Certificate.v1_5_3.Certificate"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Certificate.v1_5_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify that `PEMChain` certificates contain leaf certificate information in the properties for the resource."/>
+      <EntityType Name="Certificate" BaseType="Certificate.v1_5_4.Certificate"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Certificate.v1_6_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2022.1"/>
@@ -838,6 +871,12 @@
       <EntityType Name="Certificate" BaseType="Certificate.v1_6_2.Certificate"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Certificate.v1_6_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify that `PEMChain` certificates contain leaf certificate information in the properties for the resource."/>
+      <EntityType Name="Certificate" BaseType="Certificate.v1_6_3.Certificate"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Certificate.v1_7_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2023.1"/>
@@ -871,6 +910,12 @@
       <EntityType Name="Certificate" BaseType="Certificate.v1_7_2.Certificate"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Certificate.v1_7_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify that `PEMChain` certificates contain leaf certificate information in the properties for the resource."/>
+      <EntityType Name="Certificate" BaseType="Certificate.v1_7_3.Certificate"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Certificate.v1_8_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2023.2"/>
@@ -897,6 +942,12 @@
       <EntityType Name="Certificate" BaseType="Certificate.v1_8_2.Certificate"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Certificate.v1_8_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify that `PEMChain` certificates contain leaf certificate information in the properties for the resource."/>
+      <EntityType Name="Certificate" BaseType="Certificate.v1_8_3.Certificate"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Certificate.v1_9_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2024.3"/>
@@ -905,5 +956,29 @@
       <EntityType Name="Certificate" BaseType="Certificate.v1_8_3.Certificate"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Certificate.v1_9_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify that `PEMChain` certificates contain leaf certificate information in the properties for the resource."/>
+      <EntityType Name="Certificate" BaseType="Certificate.v1_9_0.Certificate"/>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Certificate.v1_10_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2025.2"/>
+      <Annotation Term="OData.Description" String="This version was created to add the value `PKCS12` to `CertificateType`."/>
+
+      <EntityType Name="Certificate" BaseType="Certificate.v1_9_1.Certificate">
+        <Property Name="Status" Type="Resource.Status" Nullable="false">
+          <Annotation Term="OData.Description" String="The status and health of the resource and its subordinate or dependent resources."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain any status or health properties of the resource."/>
+        </Property>
+        <Property Name="Password" Type="Edm.String">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Write"/>
+          <Annotation Term="OData.Description" String="The password for the certificate."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the password for the certificate contained in the `CertificateString` property.  This property shall be required in create requests if the `CertificateType` property contains `PKCS12` and the client-provided certificate is password protected.  This property shall not be present in responses."/>
+        </Property>
+      </EntityType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/Chassis_v1.xml b/redfish-core/schema/dmtf/csdl/Chassis_v1.xml
index 9982e4e..7244524 100644
--- a/redfish-core/schema/dmtf/csdl/Chassis_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/Chassis_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  Chassis v1.26.0                                                     -->
+<!--# Redfish Schema:  Chassis v1.27.0                                                     -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -142,6 +142,12 @@
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/LeakDetectorCollection_v1.xml">
     <edmx:Include Namespace="LeakDetectorCollection"/>
   </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/AutomationNodeCollection_v1.xml">
+    <edmx:Include Namespace="AutomationNodeCollection"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/AutomationNode_v1.xml">
+    <edmx:Include Namespace="AutomationNode"/>
+  </edmx:Reference>
 
   <edmx:DataServices>
 
@@ -2669,5 +2675,21 @@
       </EntityType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Chassis.v1_27_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2025.2"/>
+
+      <EntityType Name="Chassis" BaseType="Chassis.v1_26_0.Chassis"/>
+
+      <ComplexType Name="Links" BaseType="Chassis.v1_23_0.Links">
+        <NavigationProperty Name="AutomationNodes" Type="Collection(AutomationNode.AutomationNode)">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="An array of links to the automation nodes contained in this chassis."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an array of links to resources of type `AutomationNode` with which this physical container is associated."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+      </ComplexType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/ComputerSystem_v1.xml b/redfish-core/schema/dmtf/csdl/ComputerSystem_v1.xml
index 7fa7131..bf302cc 100644
--- a/redfish-core/schema/dmtf/csdl/ComputerSystem_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/ComputerSystem_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  ComputerSystem v1.24.0                                              -->
+<!--# Redfish Schema:  ComputerSystem v1.25.0                                              -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -3873,5 +3873,28 @@
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_23_1.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_25_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2025.2"/>
+
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_24_0.ComputerSystem">
+        <Property Name="IPMIHostInterface" Type="ComputerSystem.v1_25_0.IPMIHostInterface" Nullable="false">
+          <Annotation Term="OData.Description" String="The information about the in-band IPMI service of this system."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the information about the in-band IPMI service of this system."/>
+        </Property>
+      </EntityType>
+
+      <ComplexType Name="IPMIHostInterface">
+        <Annotation Term="OData.AdditionalProperties" Bool="false"/>
+        <Annotation Term="OData.Description" String="The information about the in-band IPMI service for this system."/>
+        <Annotation Term="OData.LongDescription" String="This type shall describe the in-band IPMI service for a computer system."/>
+        <Property Name="ServiceEnabled" Type="Edm.Boolean" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="An indication of whether the service is enabled for this system."/>
+          <Annotation Term="OData.LongDescription" String="This property shall indicate whether the protocol for the service is enabled."/>
+        </Property>
+      </ComplexType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/ConnectionMethod_v1.xml b/redfish-core/schema/dmtf/csdl/ConnectionMethod_v1.xml
index 167d60f..e564fb6 100644
--- a/redfish-core/schema/dmtf/csdl/ConnectionMethod_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/ConnectionMethod_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  ConnectionMethod v1.1.1                                             -->
+<!--# Redfish Schema:  ConnectionMethod v1.2.0                                             -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -27,6 +27,9 @@
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/AggregationSource_v1.xml">
     <edmx:Include Namespace="AggregationSource"/>
   </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/SerialInterface_v1.xml">
+    <edmx:Include Namespace="SerialInterface"/>
+  </edmx:Reference>
 
   <edmx:DataServices>
 
@@ -138,6 +141,30 @@
           <Annotation Term="OData.Description" String="OEM connection method."/>
           <Annotation Term="OData.LongDescription" String="This value shall indicate the connection method is OEM.  The `ConnectionMethodVariant` property shall contain further identification information."/>
         </Member>
+        <Member Name="ModbusSerial">
+          <Annotation Term="OData.Description" String="Modbus serial connection method."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the connection method is Modbus serial (RTU)."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_2_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
+        <Member Name="ModbusTCP">
+          <Annotation Term="OData.Description" String="Modbus TCP connection method."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the connection method is Modbus TCP."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_2_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
       </EnumType>
     </Schema>
 
@@ -177,5 +204,22 @@
       <EntityType Name="ConnectionMethod" BaseType="ConnectionMethod.v1_1_0.ConnectionMethod"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ConnectionMethod.v1_2_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2025.2"/>
+      <Annotation Term="OData.Description" String="This version was created to add `ModbusSerial` and `ModbusTCP` to `ConnectionMethodType`."/>
+
+      <EntityType Name="ConnectionMethod" BaseType="ConnectionMethod.v1_1_1.ConnectionMethod"/>
+
+      <ComplexType Name="Links" BaseType="ConnectionMethod.v1_0_0.Links">
+        <NavigationProperty Name="SerialInterface" Type="SerialInterface.SerialInterface" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The link to the serial interface for this connection method."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource of type `SerialInterface` that represents the serial interface for this connection method."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+      </ComplexType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/Control_v1.xml b/redfish-core/schema/dmtf/csdl/Control_v1.xml
index 2c1bda3..6c24228 100644
--- a/redfish-core/schema/dmtf/csdl/Control_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/Control_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  Control v1.6.0                                                      -->
+<!--# Redfish Schema:  Control v1.7.0                                                      -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -120,7 +120,7 @@
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
           <Annotation Term="OData.Description" String="The desired set point of the control."/>
           <Annotation Term="OData.LongDescription" String="This property shall contain the desired set point control value.  The units shall follow the value of `SetPointUnits`.  If the `DefaultSetPoint` property is not supported and if a user-defined set point is not configured, the property may contain `null` in responses."/>
-          <Annotation Term="Redfish.Excerpt" String="Single,SingleLoop"/>
+          <Annotation Term="Redfish.Excerpt" String="Single,SingleLoop,Node"/>
         </Property>
         <Property Name="SettingMin" Type="Edm.Decimal">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
@@ -144,6 +144,7 @@
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The units of the set point and related properties in UCUM c/s format."/>
           <Annotation Term="OData.LongDescription" String="This property shall contain the units of the control's set point and related properties.  The value shall follow the case-sensitive symbol format defined by the Unified Code for Units of Measure (UCUM), as specified by the 'Units of measure annotation' clause of the Redfish Specification."/>
+          <Annotation Term="Redfish.Excerpt" String="Node"/>
         </Property>
         <Property Name="DeadBand" Type="Edm.Decimal">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
@@ -229,6 +230,7 @@
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The units of the sensor reading associated with this control."/>
           <Annotation Term="OData.LongDescription" String="This property shall contain the units of the sensor's reading and thresholds.  This property shall not be present if multiple sensors are associated with a single control."/>
+          <Annotation Term="Redfish.Excerpt" String="Node"/>
           <Annotation Term="Redfish.ExcerptCopyOnly"/>
         </Property>
 
@@ -374,6 +376,78 @@
             </Collection>
           </Annotation>
         </Member>
+        <Member Name="LinearPosition">
+          <Annotation Term="OData.Description" String="Linear position or distance (m) control."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate a control used to adjust linear position or distance, in meter units.  The `SetPointUnits` property shall contain `m`."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_6_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
+        <Member Name="LinearVelocity">
+          <Annotation Term="OData.Description" String="Linear velocity (m/s) control."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate a control used to adjust linear velocity, in meters per second units.  The `SetPointUnits` property shall contain `m/s`."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_6_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
+        <Member Name="LinearAcceleration">
+          <Annotation Term="OData.Description" String="Linear acceleration (m/s^2) control."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate a control used to adjust linear acceleration, in meters per square second units.  The `SetPointUnits` property shall contain `m/s2`."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_6_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
+        <Member Name="RotationalPosition">
+          <Annotation Term="OData.Description" String="Rotational position (rad) control."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate a control used to adjust rotational position, in radian units.  The `SetPointUnits` property shall contain `rad`."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_6_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
+        <Member Name="RotationalVelocity">
+          <Annotation Term="OData.Description" String="Rotational velocity (rad/s) control."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate a control used to adjust rotational velocity, in radians per second units.  The `SetPointUnits` property shall contain `rad/s`."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_6_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
+        <Member Name="RotationalAcceleration">
+          <Annotation Term="OData.Description" String="Rotational acceleration (rad/s^2) control."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate a control used to adjust rotational acceleration, in radians per square second units.  The `SetPointUnits` property shall contain `rad/s2`."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_6_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
         <Member Name="LiquidFlowLPM">
           <Annotation Term="OData.Description" String="Liquid flow (L/min) control."/>
           <Annotation Term="OData.LongDescription" String="This value shall indicate a control used to adjust the volume of liquid per unit of time, in liters per minute units, that flows through a particular junction.  The `SetPointUnits` property shall contain `L/min`."/>
@@ -397,6 +471,18 @@
           <Annotation Term="OData.Description" String="Control uses a range of values."/>
           <Annotation Term="OData.LongDescription" String="This value shall indicate the control utilizes a set point range for its operation.  The `SettingMin` and `SettingMax` properties shall be present for this control type.  The `SetPoint` property shall not be present for this control type."/>
         </Member>
+        <Member Name="Monitor">
+          <Annotation Term="OData.Description" String="Control only monitors a reading."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the control provides only monitoring of a sensor reading, and does not provide the ability to affect the reading.  This value allows for multiple controls to be populated while only some of those controls provide a set point.  The `SetPoint,`SettingMin` and `SettingMax` properties shall not be present for this control type.  For example, a motion controller may provide both position-based and velocity-based control modes, where the selected mode provides the `SetPoint`, and the control for the non-selected mode provides only a sensor reading."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_6_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
       </EnumType>
 
       <EnumType Name="ControlMode">
@@ -467,6 +553,12 @@
       <EntityType Name="Control" BaseType="Control.v1_0_3.Control"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Control.v1_0_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to add excerpt definitions to support automation nodes."/>
+      <EntityType Name="Control" BaseType="Control.v1_0_4.Control"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Control.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2021.4"/>
@@ -493,6 +585,12 @@
       <EntityType Name="Control" BaseType="Control.v1_1_2.Control"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Control.v1_1_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to add excerpt definitions to support automation nodes."/>
+      <EntityType Name="Control" BaseType="Control.v1_1_3.Control"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Control.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2022.2"/>
@@ -519,6 +617,12 @@
       <EntityType Name="Control" BaseType="Control.v1_2_2.Control"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Control.v1_2_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to add excerpt definitions to support automation nodes."/>
+      <EntityType Name="Control" BaseType="Control.v1_2_3.Control"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Control.v1_3_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2023.1"/>
@@ -552,6 +656,12 @@
       <EntityType Name="Control" BaseType="Control.v1_3_2.Control"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Control.v1_3_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to add excerpt definitions to support automation nodes."/>
+      <EntityType Name="Control" BaseType="Control.v1_3_3.Control"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Control.v1_4_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2023.2"/>
@@ -584,6 +694,12 @@
       <EntityType Name="Control" BaseType="Control.v1_4_2.Control"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Control.v1_4_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to add excerpt definitions to support automation nodes."/>
+      <EntityType Name="Control" BaseType="Control.v1_4_3.Control"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Control.v1_5_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2023.3"/>
@@ -604,6 +720,12 @@
       <EntityType Name="Control" BaseType="Control.v1_5_1.Control"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Control.v1_5_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to add excerpt definitions to support automation nodes."/>
+      <EntityType Name="Control" BaseType="Control.v1_5_2.Control"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Control.v1_6_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2024.4"/>
@@ -612,5 +734,25 @@
       <EntityType Name="Control" BaseType="Control.v1_5_2.Control"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Control.v1_6_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to add excerpt definitions to support automation nodes."/>
+      <EntityType Name="Control" BaseType="Control.v1_6_0.Control"/>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Control.v1_7_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2025.2"/>
+      <Annotation Term="OData.Description" String="This version was created to add `LinearPosition`, `LinearVelocity`, `LinearAcceleration`, `RotationalPosition`, `RotationalVelocity`, and `RotationalAcceleration` to `ControlType`.  It was also created to add `Monitor` to `SetPointType`."/>
+
+      <EntityType Name="Control" BaseType="Control.v1_6_1.Control">
+        <Property Name="SetPointError" Type="Edm.Decimal">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The error (difference) from the desired set point of the control."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the error, or difference, of the related Sensor `Reading` value from the value of the `SetPoint`.  The units shall follow the value of `SetPointUnits`."/>
+        </Property>
+      </EntityType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/CoolantConnectorCollection_v1.xml b/redfish-core/schema/dmtf/csdl/CoolantConnectorCollection_v1.xml
index 2e07ca4..8a12f17 100644
--- a/redfish-core/schema/dmtf/csdl/CoolantConnectorCollection_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/CoolantConnectorCollection_v1.xml
@@ -62,6 +62,7 @@
             <String>/redfish/v1/ThermalEquipment/ImmersionUnits/{CoolingUnitId}/SecondaryCoolantConnectors</String>
             <String>/redfish/v1/ThermalEquipment/HeatExchangers/{CoolingUnitId}/PrimaryCoolantConnectors</String>
             <String>/redfish/v1/ThermalEquipment/HeatExchangers/{CoolingUnitId}/SecondaryCoolantConnectors</String>
+            <String>/redfish/v1/ThermalEquipment/RPUs/{CoolingUnitId}/PrimaryCoolantConnectors</String>
           </Collection>
         </Annotation>
         <NavigationProperty Name="Members" Type="Collection(CoolantConnector.CoolantConnector)">
diff --git a/redfish-core/schema/dmtf/csdl/CoolantConnector_v1.xml b/redfish-core/schema/dmtf/csdl/CoolantConnector_v1.xml
index 81db1c6..7689a58 100644
--- a/redfish-core/schema/dmtf/csdl/CoolantConnector_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/CoolantConnector_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  CoolantConnector v1.1.0                                             -->
+<!--# Redfish Schema:  CoolantConnector v1.2.0                                             -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -80,6 +80,7 @@
             <String>/redfish/v1/ThermalEquipment/ImmersionUnits/{CoolingUnitId}/SecondaryCoolantConnectors/{CoolantConnectorId}</String>
             <String>/redfish/v1/ThermalEquipment/HeatExchangers/{CoolingUnitId}/PrimaryCoolantConnectors/{CoolantConnectorId}</String>
             <String>/redfish/v1/ThermalEquipment/HeatExchangers/{CoolingUnitId}/SecondaryCoolantConnectors/{CoolantConnectorId}</String>
+            <String>/redfish/v1/ThermalEquipment/RPUs/{CoolingUnitId}/PrimaryCoolantConnectors/{CoolantConnectorId}</String>
           </Collection>
         </Annotation>
       </EntityType>
@@ -306,5 +307,25 @@
       </EntityType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="CoolantConnector.v1_2_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2025.2"/>
+
+      <EntityType Name="CoolantConnector" BaseType="CoolantConnector.v1_1_0.CoolantConnector">
+        <NavigationProperty Name="ValvePositionPercent" Type="Sensor.Sensor">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="Redfish.ExcerptCopy"/>
+          <Annotation Term="OData.Description" String="The valve position (% open) of this connector."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the valve position, in percent units, of this connector.  The value of the `DataSourceUri` property, if present, shall reference a resource of type `Sensor` with the `ReadingType` property containing the value `Valve`."/>
+        </NavigationProperty>
+        <NavigationProperty Name="ValvePositionControlPercent" Type="Control.Control">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="Redfish.ExcerptCopy" String="SingleLoop"/>
+          <Annotation Term="OData.Description" String="The desired valve position (% open)."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the desired valve position, in percent units, of this coolant connector.  The value of the `DataSourceUri` property, if present, shall reference a resource of type `Control` with the `ControlType` property containing the value `Valve`.  Services may automatically change other controls if a client attempts to enable this control to prevent conflicts."/>
+        </NavigationProperty>
+      </EntityType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/CoolingUnitCollection_v1.xml b/redfish-core/schema/dmtf/csdl/CoolingUnitCollection_v1.xml
index 9a8c4d1..968e8aa 100644
--- a/redfish-core/schema/dmtf/csdl/CoolingUnitCollection_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/CoolingUnitCollection_v1.xml
@@ -56,6 +56,7 @@
             <String>/redfish/v1/ThermalEquipment/CDUs</String>
             <String>/redfish/v1/ThermalEquipment/ImmersionUnits</String>
             <String>/redfish/v1/ThermalEquipment/HeatExchangers</String>
+            <String>/redfish/v1/ThermalEquipment/RPUs</String>
           </Collection>
         </Annotation>
         <NavigationProperty Name="Members" Type="Collection(CoolingUnit.CoolingUnit)">
diff --git a/redfish-core/schema/dmtf/csdl/CoolingUnit_v1.xml b/redfish-core/schema/dmtf/csdl/CoolingUnit_v1.xml
index 7a882bd..969a3bd 100644
--- a/redfish-core/schema/dmtf/csdl/CoolingUnit_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/CoolingUnit_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  CoolingUnit v1.2.0                                                  -->
+<!--# Redfish Schema:  CoolingUnit v1.3.0                                                  -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -96,6 +96,7 @@
             <String>/redfish/v1/ThermalEquipment/CDUs/{CoolingUnitId}</String>
             <String>/redfish/v1/ThermalEquipment/ImmersionUnits/{CoolingUnitId}</String>
             <String>/redfish/v1/ThermalEquipment/HeatExchangers/{CoolingUnitId}</String>
+            <String>/redfish/v1/ThermalEquipment/RPUs/{CoolingUnitId}</String>
           </Collection>
         </Annotation>
       </EntityType>
@@ -291,6 +292,17 @@
         <Member Name="ImmersionUnit">
           <Annotation Term="OData.Description" String="An immersion cooling unit."/>
         </Member>
+        <Member Name="RPU">
+          <Annotation Term="OData.Description" String="A reservoir and pumping unit (RPU)."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_3_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
       </EnumType>
 
       <ComplexType Name="Actions">
@@ -377,5 +389,13 @@
       </EnumType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="CoolingUnit.v1_3_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2025.2"/>
+      <Annotation Term="OData.Description" String="This version was created to add `RPU` to `CoolingUnitType`."/>
+
+      <EntityType Name="CoolingUnit" BaseType="CoolingUnit.v1_2_0.CoolingUnit"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/DriveMetrics_v1.xml b/redfish-core/schema/dmtf/csdl/DriveMetrics_v1.xml
index 3c9c76b..0e0e1f7 100644
--- a/redfish-core/schema/dmtf/csdl/DriveMetrics_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/DriveMetrics_v1.xml
@@ -66,6 +66,15 @@
             <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/Drives/{DriveId}/Metrics</String>
           </Collection>
         </Annotation>
+        <Annotation Term="Redfish.DeprecatedUris">
+          <Collection>
+            <String>/redfish/v1/Systems/{ComputerSystemId}/Storage/{StorageId}/Drives/{DriveId}/Metrics</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/Drives/{DriveId}/Metrics</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/Drives/{DriveId}/Metrics</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/Drives/{DriveId}/Metrics</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/Drives/{DriveId}/Metrics</String>
+          </Collection>
+        </Annotation>
       </EntityType>
     </Schema>
 
diff --git a/redfish-core/schema/dmtf/csdl/Drive_v1.xml b/redfish-core/schema/dmtf/csdl/Drive_v1.xml
index 4b99e54..201ded9 100644
--- a/redfish-core/schema/dmtf/csdl/Drive_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/Drive_v1.xml
@@ -108,6 +108,15 @@
             <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/Drives/{DriveId}</String>
           </Collection>
         </Annotation>
+        <Annotation Term="Redfish.DeprecatedUris">
+          <Collection>
+            <String>/redfish/v1/Systems/{ComputerSystemId}/Storage/{StorageId}/Drives/{DriveId}</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/Drives/{DriveId}</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/Drives/{DriveId}</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/Drives/{DriveId}</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/Drives/{DriveId}</String>
+          </Collection>
+        </Annotation>
       </EntityType>
 
       <Action Name="SecureErase" IsBound="true">
diff --git a/redfish-core/schema/dmtf/csdl/EnvironmentMetrics_v1.xml b/redfish-core/schema/dmtf/csdl/EnvironmentMetrics_v1.xml
index 5d4c4ef..2bd295e 100644
--- a/redfish-core/schema/dmtf/csdl/EnvironmentMetrics_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/EnvironmentMetrics_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  EnvironmentMetrics v1.4.0                                           -->
+<!--# Redfish Schema:  EnvironmentMetrics v1.5.0                                           -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -61,7 +61,7 @@
             <String>/redfish/v1/Systems/{ComputerSystemId}/Memory/{MemoryId}/EnvironmentMetrics</String>
             <String>/redfish/v1/Systems/{ComputerSystemId}/Storage/{StorageId}/Drives/{DriveId}/EnvironmentMetrics</String>
             <String>/redfish/v1/Systems/{ComputerSystemId}/PCIeDevices/{PCIeDeviceId}/EnvironmentMetrics</String>
-            <String>/redfish/v1/Systems/{ComputerSystemId}/Storage/{StorageId}/Controllers/{ControllerId}/EnvironmentMetrics</String>
+            <String>/redfish/v1/Systems/{ComputerSystemId}/Storage/{StorageId}/Controllers/{StorageControllerId}/EnvironmentMetrics</String>
             <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Processors/{ProcessorId}/EnvironmentMetrics</String>
             <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Memory/{MemoryId}/EnvironmentMetrics</String>
             <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/Drives/{DriveId}/EnvironmentMetrics</String>
@@ -70,18 +70,18 @@
             <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Memory/{MemoryId}/EnvironmentMetrics</String>
             <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/PCIeDevices/{PCIeDeviceId}/EnvironmentMetrics</String>
             <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/Drives/{DriveId}/EnvironmentMetrics</String>
-            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/Controllers/{ControllerId}/EnvironmentMetrics</String>
-            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/Controllers/{ControllerId}/EnvironmentMetrics</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/Controllers/{StorageControllerId}/EnvironmentMetrics</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/Controllers/{StorageControllerId}/EnvironmentMetrics</String>
             <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Processors/{ProcessorId}/EnvironmentMetrics</String>
             <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Memory/{MemoryId}/EnvironmentMetrics</String>
             <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/Drives/{DriveId}/EnvironmentMetrics</String>
-            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/Controllers/{ControllerId}/EnvironmentMetrics</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/Controllers/{StorageControllerId}/EnvironmentMetrics</String>
             <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Drives/{DriveId}/EnvironmentMetrics</String>
             <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Processors/{ProcessorId}/EnvironmentMetrics</String>
             <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Memory/{MemoryId}/EnvironmentMetrics</String>
             <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/PCIeDevices/{PCIeDeviceId}/EnvironmentMetrics</String>
             <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/Drives/{DriveId}/EnvironmentMetrics</String>
-            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/Controllers/{ControllerId}/EnvironmentMetrics</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/Controllers/{StorageControllerId}/EnvironmentMetrics</String>
             <String>/redfish/v1/Chassis/{ChassisId}/Memory/{MemoryId}/EnvironmentMetrics</String>
             <String>/redfish/v1/Chassis/{ChassisId}/Drives/{DriveId}/EnvironmentMetrics</String>
             <String>/redfish/v1/Chassis/{ChassisId}/EnvironmentMetrics</String>
@@ -91,13 +91,13 @@
             <String>/redfish/v1/Facilities/{FacilityId}/EnvironmentMetrics</String>
             <String>/redfish/v1/Facilities/{FacilityId}/AmbientMetrics</String>
             <String>/redfish/v1/Fabrics/{FabricId}/Switches/{SwitchId}/EnvironmentMetrics</String>
-            <String>/redfish/v1/Storage/{StorageId}/Controllers/{ControllerId}/EnvironmentMetrics</String>
+            <String>/redfish/v1/Storage/{StorageId}/Controllers/{StorageControllerId}/EnvironmentMetrics</String>
             <String>/redfish/v1/Fabrics/{FabricId}/Switches/{SwitchId}/Ports/{PortId}/EnvironmentMetrics</String>
             <String>/redfish/v1/Systems/{ComputerSystemId}/Storage/{StorageId}/StorageControllers/{StorageControllerId}/Ports/{PortId}/EnvironmentMetrics</String>
             <String>/redfish/v1/Systems/{ComputerSystemId}/Storage/{StorageId}/Controllers/{StorageControllerId}/Ports/{PortId}/EnvironmentMetrics</String>
             <String>/redfish/v1/Systems/{ComputerSystemId}/FabricAdapters/{FabricAdapterId}/Ports/{PortId}/EnvironmentMetrics</String>
-            <String>/redfish/v1/Systems/{ComputerSystemId}/GraphicsControllers/{ControllerId}/Ports/{PortId}/EnvironmentMetrics</String>
-            <String>/redfish/v1/Systems/{ComputerSystemId}/USBControllers/{ControllerId}/Ports/{PortId}/EnvironmentMetrics</String>
+            <String>/redfish/v1/Systems/{ComputerSystemId}/GraphicsControllers/{GraphicsControllerId}/Ports/{PortId}/EnvironmentMetrics</String>
+            <String>/redfish/v1/Systems/{ComputerSystemId}/USBControllers/{USBControllerId}/Ports/{PortId}/EnvironmentMetrics</String>
             <String>/redfish/v1/Systems/{ComputerSystemId}/Processors/{ProcessorId}/Ports/{PortId}/EnvironmentMetrics</String>
             <String>/redfish/v1/Chassis/{ChassisId}/MediaControllers/{MediaControllerId}/Ports/{PortId}/EnvironmentMetrics</String>
             <String>/redfish/v1/Chassis/{ChassisId}/FabricAdapters/{FabricAdapterId}/Ports/{PortId}/EnvironmentMetrics</String>
@@ -108,8 +108,8 @@
             <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/StorageControllers/{StorageControllerId}/Ports/{PortId}/EnvironmentMetrics</String>
             <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/Controllers/{StorageControllerId}/Ports/{PortId}/EnvironmentMetrics</String>
             <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/FabricAdapters/{FabricAdapterId}/Ports/{PortId}/EnvironmentMetrics</String>
-            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/GraphicsControllers/{ControllerId}/Ports/{PortId}/EnvironmentMetrics</String>
-            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/USBControllers/{ControllerId}/Ports/{PortId}/EnvironmentMetrics</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/GraphicsControllers/{GraphicsControllerId}/Ports/{PortId}/EnvironmentMetrics</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/USBControllers/{USBControllerId}/Ports/{PortId}/EnvironmentMetrics</String>
             <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Processors/{ProcessorId}/Ports/{PortId}/EnvironmentMetrics</String>
             <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/StorageControllers/{StorageControllerId}/Ports/{PortId}/EnvironmentMetrics</String>
             <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/Controllers/{StorageControllerId}/Ports/{PortId}/EnvironmentMetrics</String>
@@ -117,8 +117,8 @@
             <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/StorageControllers/{StorageControllerId}/Ports/{PortId}/EnvironmentMetrics</String>
             <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/Controllers/{StorageControllerId}/Ports/{PortId}/EnvironmentMetrics</String>
             <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/FabricAdapters/{FabricAdapterId}/Ports/{PortId}/EnvironmentMetrics</String>
-            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/GraphicsControllers/{ControllerId}/Ports/{PortId}/EnvironmentMetrics</String>
-            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/USBControllers/{ControllerId}/Ports/{PortId}/EnvironmentMetrics</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/GraphicsControllers/{GraphicsControllerId}/Ports/{PortId}/EnvironmentMetrics</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/USBControllers/{USBControllerId}/Ports/{PortId}/EnvironmentMetrics</String>
             <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Processors/{ProcessorId}/Ports/{PortId}/EnvironmentMetrics</String>
             <String>/redfish/v1/Storage/{StorageId}/StorageControllers/{StorageControllerId}/Ports/{PortId}/EnvironmentMetrics</String>
             <String>/redfish/v1/Storage/{StorageId}/Controllers/{StorageControllerId}/Ports/{PortId}/EnvironmentMetrics</String>
@@ -127,6 +127,16 @@
             <String>/redfish/v1/ThermalEquipment/CDUs/{CoolingUnitId}/EnvironmentMetrics</String>
             <String>/redfish/v1/ThermalEquipment/ImmersionUnits/{CoolingUnitId}/EnvironmentMetrics</String>
             <String>/redfish/v1/ThermalEquipment/HeatExchangers/{CoolingUnitId}/EnvironmentMetrics</String>
+            <String>/redfish/v1/ThermalEquipment/RPUs/{CoolingUnitId}/EnvironmentMetrics</String>
+          </Collection>
+        </Annotation>
+        <Annotation Term="Redfish.DeprecatedUris">
+          <Collection>
+            <String>/redfish/v1/Systems/{ComputerSystemId}/Storage/{StorageId}/Drives/{DriveId}/EnvironmentMetrics</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/Drives/{DriveId}/EnvironmentMetrics</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/Drives/{DriveId}/EnvironmentMetrics</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/Drives/{DriveId}/EnvironmentMetrics</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/Drives/{DriveId}/EnvironmentMetrics</String>
           </Collection>
         </Annotation>
       </EntityType>
@@ -352,5 +362,23 @@
       </EntityType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EnvironmentMetrics.v1_5_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2025.2"/>
+
+      <EntityType Name="EnvironmentMetrics" BaseType="EnvironmentMetrics.v1_4_0.EnvironmentMetrics">
+        <NavigationProperty Name="Voltage" Type="Sensor.Sensor">
+          <Annotation Term="Redfish.ExcerptCopy" String="Voltage"/>
+          <Annotation Term="OData.Description" String="The voltage (V) for this device."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the voltage, in volt units, for this device.  The value of the `DataSourceUri` property, if present, shall reference a resource of type `Sensor` with the `ReadingType` property containing the value `Voltage`."/>
+        </NavigationProperty>
+        <NavigationProperty Name="CurrentAmps" Type="Sensor.Sensor">
+          <Annotation Term="Redfish.ExcerptCopy" String="Current"/>
+          <Annotation Term="OData.Description" String="The current (A) for this device."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the current, in ampere units, for this device.  The value of the `DataSourceUri` property, if present, shall reference a resource of type `Sensor` with the `ReadingType` property containing the value `Current`."/>
+        </NavigationProperty>
+      </EntityType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/Fabric_v1.xml b/redfish-core/schema/dmtf/csdl/Fabric_v1.xml
index bc3b624..4eb179f 100644
--- a/redfish-core/schema/dmtf/csdl/Fabric_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/Fabric_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  Fabric v1.3.2                                                       -->
+<!--# Redfish Schema:  Fabric v1.4.0                                                       -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -45,6 +45,9 @@
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/ConnectionCollection_v1.xml">
     <edmx:Include Namespace="ConnectionCollection"/>
   </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Manager_v1.xml">
+    <edmx:Include Namespace="Manager"/>
+  </edmx:Reference>
 
   <edmx:DataServices>
 
@@ -308,5 +311,21 @@
       <EntityType Name="Fabric" BaseType="Fabric.v1_3_1.Fabric"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Fabric.v1_4_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2025.2"/>
+
+      <EntityType Name="Fabric" BaseType="Fabric.v1_3_2.Fabric"/>
+
+      <ComplexType Name="Links" BaseType="Fabric.v1_0_0.Links">
+        <NavigationProperty Name="ManagedBy" Type="Collection(Manager.Manager)">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="An array of links to the managers responsible for managing this fabric."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an array of links to resources of type `Manager` that represent the managers responsible for managing this fabric."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+      </ComplexType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/FilterCollection_v1.xml b/redfish-core/schema/dmtf/csdl/FilterCollection_v1.xml
index b1ea8f9..fe247f9 100644
--- a/redfish-core/schema/dmtf/csdl/FilterCollection_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/FilterCollection_v1.xml
@@ -53,6 +53,7 @@
         </Annotation>
         <Annotation Term="Redfish.Uris">
           <Collection>
+            <String>/redfish/v1/Chassis/{ChassisId}/ThermalSubsystem/Filters</String>
             <String>/redfish/v1/Chassis/{ChassisId}/ThermalSubsystem/Pumps/{PumpId}/Filters</String>
             <String>/redfish/v1/ThermalEquipment/CDUs/{CoolingUnitId}/Filters</String>
             <String>/redfish/v1/ThermalEquipment/CDUs/{CoolingUnitId}/Reservoirs/{ReservoirId}/Filters</String>
@@ -63,6 +64,9 @@
             <String>/redfish/v1/ThermalEquipment/HeatExchangers/{CoolingUnitId}/Filters</String>
             <String>/redfish/v1/ThermalEquipment/HeatExchangers/{CoolingUnitId}/Reservoirs/{ReservoirId}/Filters</String>
             <String>/redfish/v1/ThermalEquipment/HeatExchangers/{CoolingUnitId}/Pumps/{PumpId}/Filters</String>
+            <String>/redfish/v1/ThermalEquipment/RPUs/{CoolingUnitId}/Filters</String>
+            <String>/redfish/v1/ThermalEquipment/RPUs/{CoolingUnitId}/Reservoirs/{ReservoirId}/Filters</String>
+            <String>/redfish/v1/ThermalEquipment/RPUs/{CoolingUnitId}/Pumps/{PumpId}/Filters</String>
           </Collection>
         </Annotation>
         <NavigationProperty Name="Members" Type="Collection(Filter.Filter)">
diff --git a/redfish-core/schema/dmtf/csdl/Filter_v1.xml b/redfish-core/schema/dmtf/csdl/Filter_v1.xml
index e6a61e4..e09da0b 100644
--- a/redfish-core/schema/dmtf/csdl/Filter_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/Filter_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  Filter v1.0.2                                                       -->
+<!--# Redfish Schema:  Filter v1.1.0                                                       -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -70,6 +70,7 @@
         </Annotation>
         <Annotation Term="Redfish.Uris">
           <Collection>
+            <String>/redfish/v1/Chassis/{ChassisId}/ThermalSubsystem/Filters/{FilterId}</String>
             <String>/redfish/v1/Chassis/{ChassisId}/ThermalSubsystem/Pumps/{PumpId}/Filters/{FilterId}</String>
             <String>/redfish/v1/ThermalEquipment/CDUs/{CoolingUnitId}/Filters/{FilterId}</String>
             <String>/redfish/v1/ThermalEquipment/CDUs/{CoolingUnitId}/Reservoirs/{ReservoirId}/Filters/{FilterId}</String>
@@ -80,6 +81,9 @@
             <String>/redfish/v1/ThermalEquipment/HeatExchangers/{CoolingUnitId}/Filters/{FilterId}</String>
             <String>/redfish/v1/ThermalEquipment/HeatExchangers/{CoolingUnitId}/Reservoirs/{ReservoirId}/Filters/{FilterId}</String>
             <String>/redfish/v1/ThermalEquipment/HeatExchangers/{CoolingUnitId}/Pumps/{PumpId}/Filters/{FilterId}</String>
+            <String>/redfish/v1/ThermalEquipment/RPUs/{CoolingUnitId}/Filters/{FilterId}</String>
+            <String>/redfish/v1/ThermalEquipment/RPUs/{CoolingUnitId}/Reservoirs/{ReservoirId}/Filters/{FilterId}</String>
+            <String>/redfish/v1/ThermalEquipment/RPUs/{CoolingUnitId}/Pumps/{PumpId}/Filters/{FilterId}</String>
           </Collection>
         </Annotation>
       </EntityType>
@@ -141,12 +145,12 @@
         <Property Name="ServicedDate" Type="Edm.DateTimeOffset">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
           <Annotation Term="OData.Description" String="The date this filter was put into service."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the date the filter or filter media was put into active service."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the date the filter or filter media was put into active service.  The service may update the value in response to an update of `ServiceHours`."/>
         </Property>
         <Property Name="ServiceHours" Type="Edm.Decimal">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
           <Annotation Term="OData.Description" String="The hours of service this filter has provided."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the number of hours of service that the filter or filter media has provided."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the number of hours of service that the filter or filter media has provided.  The service may reset or update the value in response to an update of `ServicedDate`."/>
         </Property>
         <Property Name="RatedServiceHours" Type="Edm.Decimal">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
@@ -204,5 +208,25 @@
       <EntityType Name="Filter" BaseType="Filter.v1_0_1.Filter"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Filter.v1_0_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the descriptions of `ServicedDate` and `ServiceHours` to indicate that when one of these properites is updated, the service may change the value of the other."/>
+      <EntityType Name="Filter" BaseType="Filter.v1_0_2.Filter"/>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Filter.v1_1_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2025.2"/>
+
+      <EntityType Name="Filter" BaseType="Filter.v1_0_3.Filter">
+        <NavigationProperty Name="DeltaLiquidPressurekPa" Type="Sensor.Sensor">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="Redfish.ExcerptCopy"/>
+          <Annotation Term="OData.Description" String="The differential pressure (kPa) across the liquid filter."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the pressure, in kilopascal units, for the difference in pressure between the intake and outflow connections on the filter.  The value of the `DataSourceUri` property, if present, shall reference a resource of type `Sensor` with the `ReadingType` property containing the value `PressurekPa`."/>
+        </NavigationProperty>
+      </EntityType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/GraphicsController_v1.xml b/redfish-core/schema/dmtf/csdl/GraphicsController_v1.xml
index c44e4c8..3670745 100644
--- a/redfish-core/schema/dmtf/csdl/GraphicsController_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/GraphicsController_v1.xml
@@ -62,7 +62,7 @@
         </Annotation>
         <Annotation Term="Redfish.Uris">
           <Collection>
-            <String>/redfish/v1/Systems/{ComputerSystemId}/GraphicsControllers/{ControllerId}</String>
+            <String>/redfish/v1/Systems/{ComputerSystemId}/GraphicsControllers/{GraphicsControllerId}</String>
           </Collection>
         </Annotation>
       </EntityType>
diff --git a/redfish-core/schema/dmtf/csdl/JobDocumentCollection_v1.xml b/redfish-core/schema/dmtf/csdl/JobDocumentCollection_v1.xml
new file mode 100644
index 0000000..600db1b
--- /dev/null
+++ b/redfish-core/schema/dmtf/csdl/JobDocumentCollection_v1.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!---->
+<!--################################################################################       -->
+<!--# Redfish Schema:  JobDocumentCollection                                               -->
+<!--#                                                                                      -->
+<!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
+<!--# available at http://www.dmtf.org/standards/redfish                                   -->
+<!--# Copyright 2014-2025 DMTF.                                                            -->
+<!--# For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright -->
+<!--################################################################################       -->
+<!---->
+<edmx:Edmx xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx" Version="4.0">
+
+  <edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Core.V1.xml">
+    <edmx:Include Namespace="Org.OData.Core.V1" Alias="OData"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Capabilities.V1.xml">
+    <edmx:Include Namespace="Org.OData.Capabilities.V1" Alias="Capabilities"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Resource_v1.xml">
+    <edmx:Include Namespace="Resource.v1_0_0"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/RedfishExtensions_v1.xml">
+    <edmx:Include Namespace="RedfishExtensions.v1_0_0" Alias="Redfish"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/JobDocument_v1.xml">
+    <edmx:Include Namespace="JobDocument"/>
+  </edmx:Reference>
+
+  <edmx:DataServices>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="JobDocumentCollection">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Language" String="en"/>
+
+      <EntityType Name="JobDocumentCollection" BaseType="Resource.v1_0_0.ResourceCollection">
+        <Annotation Term="OData.Description" String="The collection of `JobDocument` resource instances."/>
+        <Annotation Term="OData.LongDescription" String="This resource shall represent a resource collection of `JobDocument` instances for a Redfish implementation."/>
+        <Annotation Term="Capabilities.InsertRestrictions">
+          <Record>
+            <PropertyValue Property="Insertable" Bool="true"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Capabilities.UpdateRestrictions">
+          <Record>
+            <PropertyValue Property="Updatable" Bool="false"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Capabilities.DeleteRestrictions">
+          <Record>
+            <PropertyValue Property="Deletable" Bool="false"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Redfish.Uris">
+          <Collection>
+            <String>/redfish/v1/JobService/Documents</String>
+          </Collection>
+        </Annotation>
+        <NavigationProperty Name="Members" Type="Collection(JobDocument.JobDocument)">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The members of this collection."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an array of links to the members of this collection."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+          <Annotation Term="Redfish.Required"/>
+        </NavigationProperty>
+      </EntityType>
+    </Schema>
+
+  </edmx:DataServices>
+</edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/JobDocument_v1.xml b/redfish-core/schema/dmtf/csdl/JobDocument_v1.xml
new file mode 100644
index 0000000..6dbd0a4
--- /dev/null
+++ b/redfish-core/schema/dmtf/csdl/JobDocument_v1.xml
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!---->
+<!--################################################################################       -->
+<!--# Redfish Schema:  JobDocument v1.0.0                                                  -->
+<!--#                                                                                      -->
+<!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
+<!--# available at http://www.dmtf.org/standards/redfish                                   -->
+<!--# Copyright 2014-2025 DMTF.                                                            -->
+<!--# For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright -->
+<!--################################################################################       -->
+<!---->
+<edmx:Edmx xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx" Version="4.0">
+
+  <edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Core.V1.xml">
+    <edmx:Include Namespace="Org.OData.Core.V1" Alias="OData"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Capabilities.V1.xml">
+    <edmx:Include Namespace="Org.OData.Capabilities.V1" Alias="Capabilities"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Resource_v1.xml">
+    <edmx:Include Namespace="Resource"/>
+    <edmx:Include Namespace="Resource.v1_0_0"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/RedfishExtensions_v1.xml">
+    <edmx:Include Namespace="RedfishExtensions.v1_0_0" Alias="Redfish"/>
+    <edmx:Include Namespace="Validation.v1_0_0" Alias="Validation"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Job_v1.xml">
+    <edmx:Include Namespace="Job"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/JobExecutor_v1.xml">
+    <edmx:Include Namespace="JobExecutor"/>
+  </edmx:Reference>
+
+  <edmx:DataServices>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="JobDocument">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Language" String="en"/>
+
+      <EntityType Name="JobDocument" BaseType="Resource.v1_0_0.Resource" Abstract="true">
+        <Annotation Term="OData.Description" String="The `JobDocument` schema describes the template for a job with a set of parameters."/>
+        <Annotation Term="OData.LongDescription" String="This resource shall represent a job document for a Redfish implementation."/>
+        <Annotation Term="Capabilities.InsertRestrictions">
+          <Record>
+            <PropertyValue Property="Insertable" Bool="false"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Capabilities.UpdateRestrictions">
+          <Record>
+            <PropertyValue Property="Updatable" Bool="false"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Capabilities.DeleteRestrictions">
+          <Record>
+            <PropertyValue Property="Deletable" Bool="true"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Redfish.Uris">
+          <Collection>
+            <String>/redfish/v1/JobService/Documents/{JobDocumentId}</String>
+          </Collection>
+        </Annotation>
+      </EntityType>
+
+      <Action Name="SubmitJob" IsBound="true">
+        <Annotation Term="OData.Description" String="Creates a new job based on the contents of this job document and additional parameters."/>
+        <Annotation Term="OData.LongDescription" String="This action shall create a new `Job` resource based on the contents of this job document and additional parameters."/>
+        <Parameter Name="JobDocument" Type="JobDocument.v1_0_0.Actions"/>
+        <Parameter Name="JobCreator" Type="Job.Job">
+          <Annotation Term="OData.Description" String="The link to the job that is submitting this job."/>
+          <Annotation Term="OData.LongDescription" String="This parameter shall contain a link to a resource of type `Job` that represents the job that is submitting this job."/>
+        </Parameter>
+        <Parameter Name="Parameters" Type="JobDocument.v1_0_0.Parameter" Nullable="false">
+          <Annotation Term="OData.Description" String="The list of parameters for the new job that are specific to this job document."/>
+          <Annotation Term="OData.LongDescription" String="This parameter shall contain the list of parameters for the new job that are specific to this job document.  Services shall reject requests containing parameters that do not meet the requirements specified by the `ParameterMetadata` property."/>
+        </Parameter>
+        <Parameter Name="StartTime" Type="Edm.DateTimeOffset">
+          <Annotation Term="OData.Description" String="The date and time when the job is scheduled to start."/>
+          <Annotation Term="OData.LongDescription" String="This parameter shall contain the date and time when the job is scheduled to start."/>
+        </Parameter>
+        <Parameter Name="PreferredExecutors" Type="Collection(JobExecutor.JobExecutor)" Nullable="false">
+          <Annotation Term="OData.Description" String="An array of links to the preferred executors to run this job."/>
+          <Annotation Term="OData.LongDescription" String="This parameter shall contain an array of links to resources of type `JobExecutor` that represent the preferred executors to run this job."/>
+        </Parameter>
+        <Parameter Name="HidePayload" Type="Edm.Boolean">
+          <Annotation Term="OData.Description" String="An indication of whether the contents of the parameters should be hidden from view after the job has been created.  If `true`, responses do not return the parameters.  If `false`, responses return the parameters.  If this parameter is not present when the job is created, the default is `false`."/>
+          <Annotation Term="OData.LongDescription" String="This parameter shall indicate whether the contents of the parameters should be hidden from view after the job has been created.  If `true`, responses shall not return the `Parameters` property.  If `false`, responses shall return the `Parameters` property.  If this parameter is not present when the job is created, the default is `false`."/>
+        </Parameter>
+      </Action>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="JobDocument.v1_0_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2025.2"/>
+
+      <EntityType Name="JobDocument" BaseType="JobDocument.JobDocument">
+        <Property Name="Status" Type="Resource.Status" Nullable="false">
+          <Annotation Term="OData.Description" String="The status and health of the resource and its subordinate or dependent resources."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain any status or health properties of the resource."/>
+        </Property>
+        <Property Name="Links" Type="JobDocument.v1_0_0.Links" Nullable="false">
+          <Annotation Term="OData.Description" String="The links to other resources that are related to this resource."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain links to resources that are related to but are not contained by, or subordinate to, this resource."/>
+        </Property>
+        <Property Name="Actions" Type="JobDocument.v1_0_0.Actions" Nullable="false">
+          <Annotation Term="OData.Description" String="The available actions for this resource."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the available actions for this resource."/>
+        </Property>
+        <Property Name="DocumentType" Type="Edm.String" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The type of job document data associated with this job document."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the type of job document data associated with this job document."/>
+        </Property>
+        <Property Name="Version" Type="Edm.String" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The version of this job document."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the version of this job document."/>
+        </Property>
+        <Property Name="CreationTime" Type="Edm.DateTimeOffset" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The date and time when this job document resource was created."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the date and time when this job document resource was created."/>
+        </Property>
+        <Property Name="DocumentData" Type="Edm.String" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The job document data as a Base64-encoded string."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a Base64-encoded string of the job document data.  This property shall not be present if `DocumentDataURI` is present."/>
+        </Property>
+        <Property Name="DocumentDataURI" Type="Edm.String" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The URI at which to access the job document data."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the URI at which to access the job document data.  This property shall not be present if `DocumentData` is present."/>
+          <Annotation Term="OData.IsURL"/>
+        </Property>
+        <Property Name="DocumentDataHash" Type="Edm.String" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The hash of the job document data."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the hash of the job document data as a hex-encoded string."/>
+          <Annotation Term="Validation.Pattern" String="^[0-9a-fA-F]+$"/>
+        </Property>
+        <Property Name="ParameterMetadata" Type="Collection(JobDocument.v1_0_0.ParameterMetadata)" Nullable="false">
+          <Annotation Term="OData.Description" String="The metadata for each of the parameters supported by this job document for the `SubmitJob` action."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the metadata for each of the parameters supported by this job document for the `SubmitJob` action."/>
+        </Property>
+      </EntityType>
+
+      <EnumType Name="DataType">
+        <Member Name="Boolean">
+          <Annotation Term="OData.Description" String="A boolean."/>
+        </Member>
+        <Member Name="Number">
+          <Annotation Term="OData.Description" String="A number."/>
+        </Member>
+        <Member Name="String">
+          <Annotation Term="OData.Description" String="A string."/>
+        </Member>
+      </EnumType>
+
+      <ComplexType Name="ParameterMetadata">
+        <Annotation Term="OData.AdditionalProperties" Bool="false"/>
+        <Annotation Term="OData.Description" String="The metadata for a parameter supported by a job document for the `SubmitJob` action."/>
+        <Annotation Term="OData.LongDescription" String="This type shall contain the metadata a parameter supported by a job document for the `SubmitJob` action."/>
+        <Property Name="AllowableNumbers" Type="Collection(Edm.String)" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The allowable numeric values or duration values, inclusive ranges of values, and incremental step values for this parameter."/>
+          <Annotation Term="OData.LongDescription" String="This property shall indicate the allowable numeric values, inclusive ranges of values, and incremental step values for this parameter, as defined in the 'Allowable values for numbers and durations' clause of the Redfish Specification.  This property shall only be present for numeric parameters or string parameters that specify a duration."/>
+        </Property>
+        <Property Name="AllowablePattern" Type="Edm.String" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The allowable pattern for this parameter."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a regular expression that describes the allowable values for this parameter.  This property shall only be present for string parameters."/>
+        </Property>
+        <Property Name="AllowableValueDescriptions" Type="Collection(Edm.String)" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="Descriptions of allowable values for this parameter."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the descriptions of allowable values for this parameter.  The descriptions shall appear in the same array order as the `AllowableValues` property."/>
+        </Property>
+        <Property Name="AllowableValues" Type="Collection(Edm.String)" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The allowable values for this parameter."/>
+          <Annotation Term="OData.LongDescription" String="This property shall indicate the allowable values for this parameter."/>
+        </Property>
+        <Property Name="DataType" Type="JobDocument.v1_0_0.DataType" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The JSON property type for this parameter."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the JSON property type for this parameter."/>
+          <Annotation Term="Redfish.Required"/>
+        </Property>
+        <Property Name="Description" Type="Resource.Description" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="A description of the parameter."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a description of the parameter."/>
+        </Property>
+        <Property Name="MaximumValue" Type="Edm.Decimal" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The maximum supported value for this parameter."/>
+          <Annotation Term="OData.LongDescription" String="This integer or number property shall contain the maximum value that this service supports.  This property shall not be present for non-integer or number parameters."/>
+        </Property>
+        <Property Name="MinimumValue" Type="Edm.Decimal" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The minimum supported value for this parameter."/>
+          <Annotation Term="OData.LongDescription" String="This integer or number property shall contain the minimum value that this service supports.  This property shall not be present for non-integer or number parameters."/>
+        </Property>
+        <Property Name="Required" Type="Edm.Boolean" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="An indication of whether the parameter is required."/>
+          <Annotation Term="OData.LongDescription" String="This property shall indicate whether the parameter is required."/>
+        </Property>
+        <Property Name="Name" Type="Edm.String" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The name of the parameter."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the name of the parameter."/>
+          <Annotation Term="Redfish.Required"/>
+        </Property>
+        <Property Name="ValueHint" Type="Edm.String" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="A hint value for the parameter."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a hint value for the parameter."/>
+        </Property>
+      </ComplexType>
+
+      <ComplexType Name="Parameter">
+        <Annotation Term="OData.AdditionalProperties" Bool="false"/>
+        <Annotation Term="OData.Description" String="An object containing a set of parameters for submitting a new job based on a job document."/>
+        <Annotation Term="OData.LongDescription" String="This type shall contain a set of parameters for submitting a new job based on a job document."/>
+        <Annotation Term="Redfish.DynamicPropertyPatterns">
+          <Collection>
+            <Record>
+            <PropertyValue Property="Pattern" String="^[A-Za-z][A-Za-z0-9_]+$"/>
+            <PropertyValue Property="Type" String="Edm.PrimitiveType"/>
+            </Record>
+          </Collection>
+        </Annotation>
+      </ComplexType>
+
+      <ComplexType Name="Links">
+        <Annotation Term="OData.Description" String="The links to other resources that are related to this resource."/>
+        <Annotation Term="OData.LongDescription" String="This Redfish Specification-described type shall contain links to resources that are related to but are not contained by, or subordinate to, this resource."/>
+        <Annotation Term="OData.AdditionalProperties" Bool="false"/>
+        <NavigationProperty Name="SupportedExecutors" Type="Collection(JobExecutor.JobExecutor)">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="An array of links to the executors that are capable of running jobs instantiated from this job document."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an array of links to resources of type `JobExecutor` that represent the executors that are capable of running jobs instantiated from this job document."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+      </ComplexType>
+
+      <ComplexType Name="Actions">
+        <Annotation Term="OData.AdditionalProperties" Bool="false"/>
+        <Annotation Term="OData.Description" String="The available actions for this resource."/>
+        <Annotation Term="OData.LongDescription" String="This type shall contain the available actions for this resource."/>
+        <Property Name="Oem" Type="JobDocument.v1_0_0.OemActions" Nullable="false">
+          <Annotation Term="OData.Description" String="The available OEM-specific actions for this resource."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the available OEM-specific actions for this resource."/>
+        </Property>
+      </ComplexType>
+
+      <ComplexType Name="OemActions">
+        <Annotation Term="OData.AdditionalProperties" Bool="true"/>
+        <Annotation Term="OData.Description" String="The available OEM-specific actions for this resource."/>
+        <Annotation Term="OData.LongDescription" String="This type shall contain the available OEM-specific actions for this resource."/>
+      </ComplexType>
+    </Schema>
+
+  </edmx:DataServices>
+</edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/JobExecutorCollection_v1.xml b/redfish-core/schema/dmtf/csdl/JobExecutorCollection_v1.xml
new file mode 100644
index 0000000..8257b13
--- /dev/null
+++ b/redfish-core/schema/dmtf/csdl/JobExecutorCollection_v1.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!---->
+<!--################################################################################       -->
+<!--# Redfish Schema:  JobExecutorCollection                                               -->
+<!--#                                                                                      -->
+<!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
+<!--# available at http://www.dmtf.org/standards/redfish                                   -->
+<!--# Copyright 2014-2025 DMTF.                                                            -->
+<!--# For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright -->
+<!--################################################################################       -->
+<!---->
+<edmx:Edmx xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx" Version="4.0">
+
+  <edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Core.V1.xml">
+    <edmx:Include Namespace="Org.OData.Core.V1" Alias="OData"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Capabilities.V1.xml">
+    <edmx:Include Namespace="Org.OData.Capabilities.V1" Alias="Capabilities"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Resource_v1.xml">
+    <edmx:Include Namespace="Resource.v1_0_0"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/RedfishExtensions_v1.xml">
+    <edmx:Include Namespace="RedfishExtensions.v1_0_0" Alias="Redfish"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/JobExecutor_v1.xml">
+    <edmx:Include Namespace="JobExecutor"/>
+  </edmx:Reference>
+
+  <edmx:DataServices>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="JobExecutorCollection">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Language" String="en"/>
+
+      <EntityType Name="JobExecutorCollection" BaseType="Resource.v1_0_0.ResourceCollection">
+        <Annotation Term="OData.Description" String="The collection of `JobExecutor` resource instances."/>
+        <Annotation Term="OData.LongDescription" String="This resource shall represent a resource collection of `JobExecutor` instances for a Redfish implementation."/>
+        <Annotation Term="Capabilities.InsertRestrictions">
+          <Record>
+            <PropertyValue Property="Insertable" Bool="true"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Capabilities.UpdateRestrictions">
+          <Record>
+            <PropertyValue Property="Updatable" Bool="false"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Capabilities.DeleteRestrictions">
+          <Record>
+            <PropertyValue Property="Deletable" Bool="false"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Redfish.Uris">
+          <Collection>
+            <String>/redfish/v1/JobService/Executors</String>
+          </Collection>
+        </Annotation>
+        <NavigationProperty Name="Members" Type="Collection(JobExecutor.JobExecutor)">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The members of this collection."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an array of links to the members of this collection."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+          <Annotation Term="Redfish.Required"/>
+        </NavigationProperty>
+      </EntityType>
+    </Schema>
+
+  </edmx:DataServices>
+</edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/JobExecutor_v1.xml b/redfish-core/schema/dmtf/csdl/JobExecutor_v1.xml
new file mode 100644
index 0000000..f3a21ab
--- /dev/null
+++ b/redfish-core/schema/dmtf/csdl/JobExecutor_v1.xml
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!---->
+<!--################################################################################       -->
+<!--# Redfish Schema:  JobExecutor v1.0.0                                                  -->
+<!--#                                                                                      -->
+<!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
+<!--# available at http://www.dmtf.org/standards/redfish                                   -->
+<!--# Copyright 2014-2025 DMTF.                                                            -->
+<!--# For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright -->
+<!--################################################################################       -->
+<!---->
+<edmx:Edmx xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx" Version="4.0">
+
+  <edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Core.V1.xml">
+    <edmx:Include Namespace="Org.OData.Core.V1" Alias="OData"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Capabilities.V1.xml">
+    <edmx:Include Namespace="Org.OData.Capabilities.V1" Alias="Capabilities"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Resource_v1.xml">
+    <edmx:Include Namespace="Resource"/>
+    <edmx:Include Namespace="Resource.v1_0_0"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/RedfishExtensions_v1.xml">
+    <edmx:Include Namespace="RedfishExtensions.v1_0_0" Alias="Redfish"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Job_v1.xml">
+    <edmx:Include Namespace="Job"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Chassis_v1.xml">
+    <edmx:Include Namespace="Chassis"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/ComputerSystem_v1.xml">
+    <edmx:Include Namespace="ComputerSystem"/>
+  </edmx:Reference>
+
+  <edmx:DataServices>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="JobExecutor">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Language" String="en"/>
+
+      <EntityType Name="JobExecutor" BaseType="Resource.v1_0_0.Resource" Abstract="true">
+        <Annotation Term="OData.Description" String="The `JobExecutor` schema describes an entity that carries out a job."/>
+        <Annotation Term="OData.LongDescription" String="This resource shall represent a job executor for a Redfish implementation."/>
+        <Annotation Term="Capabilities.InsertRestrictions">
+          <Record>
+            <PropertyValue Property="Insertable" Bool="false"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Capabilities.UpdateRestrictions">
+          <Record>
+            <PropertyValue Property="Updatable" Bool="false"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Capabilities.DeleteRestrictions">
+          <Record>
+            <PropertyValue Property="Deletable" Bool="true"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Redfish.Uris">
+          <Collection>
+            <String>/redfish/v1/JobService/Executors/{JobExecutorId}</String>
+          </Collection>
+        </Annotation>
+      </EntityType>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="JobExecutor.v1_0_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2025.2"/>
+
+      <EntityType Name="JobExecutor" BaseType="JobExecutor.JobExecutor">
+        <Property Name="ExecutorType" Type="Edm.String" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The primary type of job this executor processes."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the primary type of job executed by this resource."/>
+        </Property>
+        <Property Name="Status" Type="Resource.Status" Nullable="false">
+          <Annotation Term="OData.Description" String="The status and health of the resource and its subordinate or dependent resources."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain any status or health properties of the resource."/>
+        </Property>
+        <Property Name="MaximumConcurrentJobs" Type="Edm.Int64" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The maximum concurrent jobs this executor can process."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the maximum concurrent jobs this executor can process."/>
+        </Property>
+        <Property Name="Links" Type="JobExecutor.v1_0_0.Links" Nullable="false">
+          <Annotation Term="OData.Description" String="The links to other resources that are related to this resource."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain links to resources that are related to but are not contained by, or subordinate to, this resource."/>
+        </Property>
+        <Property Name="Actions" Type="JobExecutor.v1_0_0.Actions" Nullable="false">
+          <Annotation Term="OData.Description" String="The available actions for this resource."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the available actions for this resource."/>
+        </Property>
+      </EntityType>
+
+      <ComplexType Name="Links">
+        <Annotation Term="OData.Description" String="The links to other resources that are related to this resource."/>
+        <Annotation Term="OData.LongDescription" String="This Redfish Specification-described type shall contain links to resources that are related to but are not contained by, or subordinate to, this resource."/>
+        <Annotation Term="OData.AdditionalProperties" Bool="false"/>
+        <NavigationProperty Name="ExecutingJobs" Type="Collection(Job.Job)">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="Links to jobs this executor is running."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an array of links to resources of type `Job` that represent the jobs this executor is running."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+        <NavigationProperty Name="Chassis" Type="Collection(Chassis.Chassis)">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="An array of links to the chassis that contain this equipment."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an array of links to resources of type `Chassis` that represent the physical containers that contain this equipment."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+        <NavigationProperty Name="ComputerSystem" Type="ComputerSystem.ComputerSystem" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The system that is performing the work of this job executor."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource of type `ComputerSystem` that represents the system that is performing the work of this job executor."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+      </ComplexType>
+
+      <ComplexType Name="Actions">
+        <Annotation Term="OData.AdditionalProperties" Bool="false"/>
+        <Annotation Term="OData.Description" String="The available actions for this resource."/>
+        <Annotation Term="OData.LongDescription" String="This type shall contain the available actions for this resource."/>
+        <Property Name="Oem" Type="JobExecutor.v1_0_0.OemActions" Nullable="false">
+          <Annotation Term="OData.Description" String="The available OEM-specific actions for this resource."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the available OEM-specific actions for this resource."/>
+        </Property>
+      </ComplexType>
+
+      <ComplexType Name="OemActions">
+        <Annotation Term="OData.AdditionalProperties" Bool="true"/>
+        <Annotation Term="OData.Description" String="The available OEM-specific actions for this resource."/>
+        <Annotation Term="OData.LongDescription" String="This type shall contain the available OEM-specific actions for this resource."/>
+      </ComplexType>
+    </Schema>
+
+  </edmx:DataServices>
+</edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/JobService_v1.xml b/redfish-core/schema/dmtf/csdl/JobService_v1.xml
index 2a719bf..1e9bc57 100644
--- a/redfish-core/schema/dmtf/csdl/JobService_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/JobService_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  JobService v1.0.6                                                   -->
+<!--# Redfish Schema:  JobService v1.1.0                                                   -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -30,7 +30,12 @@
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/LogService_v1.xml">
     <edmx:Include Namespace="LogService"/>
   </edmx:Reference>
-
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/JobDocumentCollection_v1.xml">
+    <edmx:Include Namespace="JobDocumentCollection"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/JobExecutorCollection_v1.xml">
+    <edmx:Include Namespace="JobExecutorCollection"/>
+  </edmx:Reference>
   <edmx:DataServices>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="JobService">
@@ -62,6 +67,20 @@
           </Collection>
         </Annotation>
       </EntityType>
+
+      <Action Name="CancelAllJobs" IsBound="true">
+        <Annotation Term="OData.Description" String="Cancels all jobs."/>
+        <Annotation Term="OData.LongDescription" String="This action shall cancel all jobs.  The service shall transition all jobs to the `Cancelled` state."/>
+        <Parameter Name="JobService" Type="JobService.v1_0_0.Actions"/>
+        <Annotation Term="Redfish.Revisions">
+          <Collection>
+            <Record>
+              <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+              <PropertyValue Property="Version" String="v1_1_0"/>
+            </Record>
+          </Collection>
+        </Annotation>
+      </Action>
     </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="JobService.v1_0_0">
@@ -81,7 +100,7 @@
         </Property>
         <Property Name="ServiceCapabilities" Type="JobService.v1_0_0.JobServiceCapabilities" Nullable="false">
           <Annotation Term="OData.Description" String="The supported capabilities of this job service implementation."/>
-          <Annotation Term="OData.LongDescription" String="This type shall contain properties that describe the capabilities or supported features of this implementation of a job service."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain properties that describe the capabilities or supported features of this implementation of a job service."/>
         </Property>
         <Property Name="Status" Type="Resource.Status" Nullable="false">
           <Annotation Term="OData.Description" String="The status and health of the resource and its subordinate or dependent resources."/>
@@ -179,5 +198,58 @@
       <EntityType Name="JobService" BaseType="JobService.v1_0_5.JobService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="JobService.v1_1_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2025.2"/>
+
+      <EntityType Name="JobService" BaseType="JobService.v1_0_6.JobService">
+        <Property Name="ValidationPolicy" Type="JobService.v1_1_0.ValidationPolicy">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The policy for how document-based jobs are validated."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain policy for how document-based jobs are validated."/>
+        </Property>
+        <NavigationProperty Name="JobDocuments" Type="JobDocumentCollection.JobDocumentCollection" ContainsTarget="true" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The links to the job document collection."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource collection of type `JobDocumentCollection`.  This property shall only be present if the service supports document-based jobs."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+        <NavigationProperty Name="JobExecutors" Type="JobExecutorCollection.JobExecutorCollection" ContainsTarget="true" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The links to the job executor collection."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource collection of type `JobExecutorCollection`.  This property shall only be present if the service supports document-based jobs."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+      </EntityType>
+
+      <ComplexType Name="JobServiceCapabilities" BaseType="JobService.v1_0_0.JobServiceCapabilities">
+        <Property Name="UserSpecifiedJobs" Type="Edm.Boolean">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="An indication of whether user-specified jobs are supported."/>
+          <Annotation Term="OData.LongDescription" String="This property shall indicate whether user-specified jobs are supported.  User-specified jobs are jobs that are created by performing an HTTP `POST` operation on the `JobCollection` resource referenced by the `Jobs` property."/>
+        </Property>
+        <Property Name="DocumentBasedJobs" Type="Edm.Boolean">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="An indication of whether document-based jobs are supported."/>
+          <Annotation Term="OData.LongDescription" String="This property shall indicate whether document-based jobs are supported.  Document-based jobs are jobs that are created by performing the `SubmitJob` action on a `JobDocument` resource in the `JobDocumentCollection` resource referenced by the `JobDocuments` property."/>
+        </Property>
+      </ComplexType>
+
+      <EnumType Name="ValidationPolicy">
+        <Member Name="Automatic">
+          <Annotation Term="OData.Description" String="Jobs are validated automatically."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate that jobs are validated automatically.  The `JobState` property of a new job shall contain `Validating` when created with the `SubmitJob` action from the `JobDocument` resource."/>
+        </Member>
+        <Member Name="Manual">
+          <Annotation Term="OData.Description" String="Jobs are validated manually."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate jobs are validated manually.  The `JobState` property of a new job shall contain `New` when created with the `SubmitJob` action from the `JobDocument` resource and wait for a user to perform the `Validate` action in the `Job` resource."/>
+        </Member>
+        <Member Name="Bypass">
+          <Annotation Term="OData.Description" String="Jobs are not validated."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate jobs are not validated.  The `JobState` property of a new job shall contain `Pending` when created with the `SubmitJob` action from the `JobDocument` resource."/>
+        </Member>
+      </EnumType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/Job_v1.xml b/redfish-core/schema/dmtf/csdl/Job_v1.xml
index 1f73d6c..51f97aa 100644
--- a/redfish-core/schema/dmtf/csdl/Job_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/Job_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  Job v1.2.4                                                          -->
+<!--# Redfish Schema:  Job v1.3.0                                                          -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -37,6 +37,12 @@
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Message_v1.xml">
     <edmx:Include Namespace="Message"/>
   </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/JobExecutor_v1.xml">
+    <edmx:Include Namespace="JobExecutor"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/JobDocument_v1.xml">
+    <edmx:Include Namespace="JobDocument"/>
+  </edmx:Reference>
 
   <edmx:DataServices>
 
@@ -72,6 +78,101 @@
         </Annotation>
       </EntityType>
 
+      <Action Name="Cancel" IsBound="true">
+        <Annotation Term="OData.Description" String="Cancels the job."/>
+        <Annotation Term="OData.LongDescription" String="This action shall cancel the job if it is currently in the `Running`, `Invalid`, or `Suspended` states.  The job shall transition to `Cancelled` if the action is successful."/>
+        <Parameter Name="Job" Type="Job.v1_0_0.Actions"/>
+        <Annotation Term="Redfish.Revisions">
+          <Collection>
+            <Record>
+              <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+              <PropertyValue Property="Version" String="v1_3_0"/>
+            </Record>
+          </Collection>
+        </Annotation>
+      </Action>
+      <Action Name="Invalidate" IsBound="true">
+        <Annotation Term="OData.Description" String="Invalidates the job."/>
+        <Annotation Term="OData.LongDescription" String="This action shall invalidate the job if it is in the `Pending` state.  The job shall transition to `Invalid` if the action is successful."/>
+        <Parameter Name="Job" Type="Job.v1_0_0.Actions"/>
+        <Annotation Term="Redfish.Revisions">
+          <Collection>
+            <Record>
+              <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+              <PropertyValue Property="Version" String="v1_3_0"/>
+            </Record>
+          </Collection>
+        </Annotation>
+      </Action>
+      <Action Name="Resubmit" IsBound="true">
+        <Annotation Term="OData.Description" String="Resubmits the job."/>
+        <Annotation Term="OData.LongDescription" String="This action shall resubmit a job to the job service.  The new job shall be based on the job document, and properties of the resource associated with this action.  Services shall take appropriate measures to make sure that appropriate security is maintained - for instance, only allowing the same user that created the job to resubmit it."/>
+        <Parameter Name="Job" Type="Job.v1_0_0.Actions"/>
+        <Parameter Name="StartTime" Type="Edm.DateTimeOffset">
+          <Annotation Term="OData.Description" String="The time to start the job."/>
+          <Annotation Term="OData.LongDescription" String="This parameter shall contain the time to start the job."/>
+        </Parameter>
+        <Annotation Term="Redfish.Revisions">
+          <Collection>
+            <Record>
+              <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+              <PropertyValue Property="Version" String="v1_3_0"/>
+            </Record>
+          </Collection>
+        </Annotation>
+      </Action>
+      <Action Name="ForceStart" IsBound="true">
+        <Annotation Term="OData.Description" String="Forces the job to start."/>
+        <Annotation Term="OData.LongDescription" String="This action shall force the job to start running if it is in the `Pending` state.  The job shall transition to `Running` if the action is successful."/>
+        <Parameter Name="Job" Type="Job.v1_0_0.Actions"/>
+        <Annotation Term="Redfish.Revisions">
+          <Collection>
+            <Record>
+              <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+              <PropertyValue Property="Version" String="v1_3_0"/>
+            </Record>
+          </Collection>
+        </Annotation>
+      </Action>
+      <Action Name="Resume" IsBound="true">
+        <Annotation Term="OData.Description" String="Resumes the job."/>
+        <Annotation Term="OData.LongDescription" String="This action shall resume the job if it is in the `Suspended` state.  The job shall transition to `Running` if the action is successful."/>
+        <Parameter Name="Job" Type="Job.v1_0_0.Actions"/>
+        <Annotation Term="Redfish.Revisions">
+          <Collection>
+            <Record>
+              <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+              <PropertyValue Property="Version" String="v1_3_0"/>
+            </Record>
+          </Collection>
+        </Annotation>
+      </Action>
+      <Action Name="Suspend" IsBound="true">
+        <Annotation Term="OData.Description" String="Suspends the job."/>
+        <Annotation Term="OData.LongDescription" String="This action shall suspend the job if it is in the `Running` state.  The job shall transition to `Suspended` if the action is successful."/>
+        <Parameter Name="Job" Type="Job.v1_0_0.Actions"/>
+        <Annotation Term="Redfish.Revisions">
+          <Collection>
+            <Record>
+              <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+              <PropertyValue Property="Version" String="v1_3_0"/>
+            </Record>
+          </Collection>
+        </Annotation>
+      </Action>
+      <Action Name="Validate" IsBound="true">
+        <Annotation Term="OData.Description" String="Validates the job."/>
+        <Annotation Term="OData.LongDescription" String="This action shall request the validation the job if it is in the `New` state.  The job shall transition to `Pending` if the action is successful.  If the job is not valid, it shall transition to `Invalid`."/>
+        <Parameter Name="Job" Type="Job.v1_0_0.Actions"/>
+        <Annotation Term="Redfish.Revisions">
+          <Collection>
+            <Record>
+              <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+              <PropertyValue Property="Version" String="v1_3_0"/>
+            </Record>
+          </Collection>
+        </Annotation>
+      </Action>
     </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Job.v1_0_0">
@@ -82,35 +183,37 @@
         <Property Name="JobStatus" Type="Resource.Health" Nullable="false">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The status of the job."/>
-          <Annotation Term="OData.LongDescription" String="This property shall indicate the health status of the job.  This property should contain `Critical` if one or more messages in the `Messages` array contains the severity `Critical`.  This property should contain `Warning` if one or more messages in the `Messages` array contains the severity `Warning` and if no messages contain the severity `Critical`.  This property should contain `OK` if all messages in the `Messages` array contain the severity `OK` or if the array is empty."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the health status of the job.  This property should contain `Critical` if one or more messages in the `Messages` array contains the severity `Critical`.  This property should contain `Warning` if one or more messages in the `Messages` array contains the severity `Warning` and if no messages contain the severity `Critical`.  This property should contain `OK` if all messages in the `Messages` array contain the severity `OK` or if the array is empty."/>
         </Property>
         <Property Name="JobState" Type="Job.v1_0_0.JobState" Nullable="false">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
           <Annotation Term="OData.Description" String="The state of the job."/>
-          <Annotation Term="OData.LongDescription" String="This property shall indicate the state of the job."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the state of the job."/>
+          <Annotation Term="Redfish.Excerpt"/>
         </Property>
         <Property Name="StartTime" Type="Edm.DateTimeOffset" Nullable="false">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The date and time when the job was started or is scheduled to start."/>
-          <Annotation Term="OData.LongDescription" String="This property shall indicate the date and time when the job was last started or is scheduled to start."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the date and time when the job was last started or is scheduled to start."/>
         </Property>
         <Property Name="EndTime" Type="Edm.DateTimeOffset" Nullable="false">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The date and time when the job was completed."/>
-          <Annotation Term="OData.LongDescription" String="This property shall indicate the date and time when the job was completed.  This property shall not appear if the job is running or was not completed.  This property shall appear only if the `JobState` is `Completed`, `Cancelled`, or `Exception`."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the date and time when the job was completed.  This property shall not appear if the job is running or was not completed.  This property shall appear only if the `JobState` is `Completed`, `Cancelled`, or `Exception`."/>
         </Property>
-        <Property Name="MaxExecutionTime" Type="Edm.String">
+        <Property Name="MaxExecutionTime" Type="Edm.Duration">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
           <Annotation Term="OData.Description" String="The maximum amount of time the job is allowed to execute."/>
-          <Annotation Term="OData.LongDescription" String="The value shall be an ISO 8601 conformant duration describing the maximum duration the job is allowed to execute before being stopped by the service."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the maximum duration the job is allowed to execute before being stopped by the service."/>
         </Property>
         <Property Name="PercentComplete" Type="Edm.Int64">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The completion percentage of this job."/>
-          <Annotation Term="OData.LongDescription" String="This property shall indicate the completion progress of the job, reported in percent of completion, `0` to `100`.  If the job has not been started, the value shall be zero."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the completion progress of the job, reported in percent of completion, `0` to `100`.  If the job has not been started, the value shall be zero."/>
           <Annotation Term="Measures.Unit" String="%"/>
           <Annotation Term="Validation.Minimum" Int="0"/>
           <Annotation Term="Validation.Maximum" Int="100"/>
+          <Annotation Term="Redfish.Excerpt"/>
         </Property>
         <Property Name="CreatedBy" Type="Edm.String" Nullable="false">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
@@ -119,27 +222,27 @@
         </Property>
         <Property Name="Schedule" Type="Schedule.Schedule" Nullable="false">
           <Annotation Term="OData.Description" String="The schedule settings for this job."/>
-          <Annotation Term="OData.LongDescription" String="This object shall contain the scheduling details for this job and the recurrence frequency for future instances of this job."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the scheduling details for this job and the recurrence frequency for future instances of this job.  This property shall not be present for document-based jobs."/>
         </Property>
         <Property Name="HidePayload" Type="Edm.Boolean" Nullable="false">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
-          <Annotation Term="OData.Description" String="An indication of whether the contents of the payload should be hidden from view after the job has been created.  If `true`, responses do not return the payload.  If `false`, responses return the payload.  If this property is not present when the job is created, the default is `false`."/>
-          <Annotation Term="OData.LongDescription" String="This property shall indicate whether the contents of the payload should be hidden from view after the job has been created.  If `true`, responses shall not return the `Payload` property.  If `false`, responses shall return the `Payload` property.  If this property is not present when the job is created, the default is `false`."/>
+          <Annotation Term="OData.Description" String="An indication of whether the contents of the payload or parameters should be hidden from view after the job has been created.  If `true`, responses do not return the payload or parameters.  If `false`, responses return the payload or parameters.  If this property is not present when the job is created, the default is `false`."/>
+          <Annotation Term="OData.LongDescription" String="This property shall indicate whether the contents of the payload should be hidden from view after the job has been created.  If `true`, responses shall not return the `Payload` or `Parameters` properties.  If `false`, responses shall return the `Payload` or `Parameters` properties.  If this property is not present when the job is created, the default is `false`."/>
         </Property>
         <Property Name="Payload" Type="Job.v1_0_0.Payload" Nullable="false">
-          <Annotation Term="OData.Description" String="The HTTP and JSON request payload details for this job."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the HTTP and JSON request payload information for executing this job.  This property shall not be included in the response if the `HidePayload` property is `true`."/>
+          <Annotation Term="OData.Description" String="The HTTP and JSON request payload details for this user-specified job."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the HTTP and JSON request payload information for executing this user-specified job.  This property shall only be present for user-specified jobs and if the `HidePayload` property is `false`."/>
         </Property>
         <NavigationProperty Name="Steps" Type="JobCollection.JobCollection" ContainsTarget="true" Nullable="false">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The link to a collection of steps for this job."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the link to a resource collection of type `JobCollection`.  This property shall not be present if this resource represents a step for a job."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the link to a resource collection of type `JobCollection`.  This property shall not be present if this resource represents a step for a job.  This property shall not be present for document-based jobs."/>
           <Annotation Term="OData.AutoExpandReferences"/>
         </NavigationProperty>
         <Property Name="StepOrder" Type="Collection(Edm.String)" Nullable="false">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The serialized execution order of the job steps."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain an array of `Id` property values for the job steps in the order that they shall be executed.  Each step shall be completed prior to the execution of the next step in array order.  An incomplete list of steps shall be considered an invalid configuration.  If this property is not present or contains an empty array it shall indicate that the step execution order is omitted and may occur in parallel or in series as determined by the service."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an array of `Id` property values for the job steps in the order that they shall be executed.  Each step shall be completed prior to the execution of the next step in array order.  An incomplete list of steps shall be considered an invalid configuration.  If this property is not present or contains an empty array it shall indicate that the step execution order is omitted and may occur in parallel or in series as determined by the service.  This property shall not be present for document-based jobs."/>
         </Property>
         <Property Name="Messages" Type="Collection(Message.Message)" Nullable="false">
           <Annotation Term="OData.Description" String="An array of messages associated with the job."/>
@@ -154,55 +257,79 @@
       <EnumType Name="JobState">
         <Member Name="New">
           <Annotation Term="OData.Description" String="A new job."/>
-          <Annotation Term="OData.LongDescription" String="This value shall represent that this job is newly created but the operation has not yet started."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate that this job is newly created but the operation has not yet started.  This shall be the initial state for document-based jobs.  Upon receiving the `Validate` action, or if the value of `ValidationPolicy` in the `JobService` resource contains `Automatic`, the document-based job's `JobState` shall transition to `Validating`.  If the `ValidationPolicy` property in the `JobService` resource contains `Bypass`, the `JobState` for a document-based job shall transition to `Pending`."/>
         </Member>
         <Member Name="Starting">
           <Annotation Term="OData.Description" String="Job is starting."/>
-          <Annotation Term="OData.LongDescription" String="This value shall represent that the operation is starting."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate that the operation is starting."/>
         </Member>
         <Member Name="Running">
           <Annotation Term="OData.Description" String="Job is running normally."/>
-          <Annotation Term="OData.LongDescription" String="This value shall represent that the operation is executing."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate that the operation is executing.  Jobs that complete successfully shall transition from this state to the `Completed` state.  Jobs that do not complete successfully shall transition from this state to the `Exception` state."/>
         </Member>
         <Member Name="Suspended">
           <Annotation Term="OData.Description" String="Job has been suspended."/>
-          <Annotation Term="OData.LongDescription" String="This value shall represent that the operation has been suspended but is expected to restart and is therefore not complete."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate that the operation has been suspended but is expected to restart and is therefore not complete.  To resume a job, perform the `Resume` action."/>
         </Member>
         <Member Name="Interrupted">
           <Annotation Term="OData.Description" String="Job has been interrupted."/>
-          <Annotation Term="OData.LongDescription" String="This value shall represent that the operation has been interrupted but is expected to restart and is therefore not complete."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate that the operation has been interrupted but is expected to restart and is therefore not complete."/>
         </Member>
         <Member Name="Pending">
           <Annotation Term="OData.Description" String="Job is pending and has not started."/>
-          <Annotation Term="OData.LongDescription" String="This value shall represent that the operation is pending some condition and has not yet begun to execute."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate that the operation is pending some condition and has not yet begun to execute."/>
         </Member>
         <Member Name="Stopping">
           <Annotation Term="OData.Description" String="Job is in the process of stopping."/>
-          <Annotation Term="OData.LongDescription" String="This value shall represent that the operation is stopping but is not yet complete."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate that the operation is stopping but is not yet complete."/>
         </Member>
         <Member Name="Completed">
           <Annotation Term="OData.Description" String="Job was completed."/>
-          <Annotation Term="OData.LongDescription" String="This value shall represent that the operation completed successfully or with warnings."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate that the operation completed successfully or with warnings.  The job may restart in the future based on the scheduling configuration of the job or operations performed by a user."/>
         </Member>
         <Member Name="Cancelled">
           <Annotation Term="OData.Description" String="Job was cancelled."/>
-          <Annotation Term="OData.LongDescription" String="This value shall represent that the operation completed because the job was cancelled by an operator."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate that the operation completed because the job was cancelled by an operator.  The job may restart in the future based on the scheduling configuration of the job or operations performed by a user."/>
         </Member>
         <Member Name="Exception">
           <Annotation Term="OData.Description" String="Job has stopped due to an exception condition."/>
-          <Annotation Term="OData.LongDescription" String="This value shall represent that the operation completed with errors."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate that the operation completed with errors.  The job may restart in the future based on the scheduling configuration of the job or operations performed by a user."/>
         </Member>
         <Member Name="Service">
           <Annotation Term="OData.Description" String="Job is running as a service."/>
-          <Annotation Term="OData.LongDescription" String="This value shall represent that the operation is now running as a service and expected to continue operation until stopped or killed."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate that the operation is now running as a service and expected to continue operation until stopped or killed."/>
         </Member>
         <Member Name="UserIntervention">
           <Annotation Term="OData.Description" String="Job is waiting for user intervention."/>
-          <Annotation Term="OData.LongDescription" String="This value shall represent that the operation is waiting for a user to intervene and needs to be manually continued, stopped, or cancelled."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate that the operation is waiting for a user to intervene and needs to be manually continued, stopped, or cancelled."/>
         </Member>
         <Member Name="Continue">
           <Annotation Term="OData.Description" String="Job is to resume operation."/>
-          <Annotation Term="OData.LongDescription" String="This value shall represent that the operation has been resumed from a paused condition and should return to a Running state."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate that the operation has been resumed from a paused condition and should return to a Running state."/>
+        </Member>
+        <Member Name="Validating">
+          <Annotation Term="OData.Description" String="Job is validating."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate that the document-based job is validating the state of the system to determine if it can run.  For example, a job that runs on factory equipment might check to ensure that the equipment is properly configured and has sufficient ingredients to run the job.  If the validation checks fail, the job shall transition to the `Invalid` state.  If the validation checks are successful, the job shall transition to the `Pending` state."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_3_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
+        <Member Name="Invalid">
+          <Annotation Term="OData.Description" String="Job is invalid."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate that validation has determined that the system is not properly configured to run the document-based job.  To perform validation checks again, perform the `Validate` action."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_3_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
         </Member>
       </EnumType>
 
@@ -322,6 +449,12 @@
       <EntityType Name="Job" BaseType="Job.v1_0_11.Job"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Job.v1_0_13">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update descriptions of properties to describe usage with document-based jobs."/>
+      <EntityType Name="Job" BaseType="Job.v1_0_12.Job"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Job.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2022.1"/>
@@ -330,7 +463,7 @@
         <Property Name="EstimatedDuration" Type="Edm.Duration">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The estimated total time required to complete the job."/>
-          <Annotation Term="OData.LongDescription" String="This property shall indicate the estimated total time needed to complete the job.  The value is not expected to change while the job is in progress, but the service may update the value if it obtains new information that significantly changes the expected duration.  Services should be conservative in the reported estimate and clients should treat this value as an estimate."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the estimated total time needed to complete the job.  The value is not expected to change while the job is in progress, but the service may update the value if it obtains new information that significantly changes the expected duration.  Services should be conservative in the reported estimate and clients should treat this value as an estimate."/>
         </Property>
       </EntityType>
     </Schema>
@@ -371,6 +504,12 @@
       <EntityType Name="Job" BaseType="Job.v1_1_5.Job"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Job.v1_1_7">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update descriptions of properties to describe usage with document-based jobs."/>
+      <EntityType Name="Job" BaseType="Job.v1_1_6.Job"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Job.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2022.3"/>
@@ -418,5 +557,113 @@
       <EntityType Name="Job" BaseType="Job.v1_2_3.Job"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Job.v1_2_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update descriptions of properties to describe usage with document-based jobs."/>
+      <EntityType Name="Job" BaseType="Job.v1_2_4.Job"/>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Job.v1_3_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2025.2"/>
+
+      <EntityType Name="Job" BaseType="Job.v1_2_5.Job">
+        <Property Name="JobType" Type="Job.v1_3_0.JobType" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The type of this job."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the type of this job."/>
+        </Property>
+        <Property Name="CreationTime" Type="Edm.DateTimeOffset" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The date and time when the job was created."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the date and time when the job was created."/>
+        </Property>
+        <Property Name="EstimatedCompletionTime" Type="Edm.DateTimeOffset" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The date and time when the job is expected to complete."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the date and time when the job is expected to complete.  If the `EstimatedDuration` property is supported, the value of this property shall contain the summation of the `StartTime` property and the `EstimatedDuration` property."/>
+          <Annotation Term="Redfish.Excerpt"/>
+        </Property>
+        <Property Name="Parameters" Type="Job.v1_3_0.Parameters" Nullable="false">
+          <Annotation Term="OData.Description" String="The parameters specified for running this document-based job."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the parameters specified for running this document-based job.  This property shall only be present for document-based jobs and if the `HidePayload` property is `false`."/>
+        </Property>
+        <Property Name="JobPriority" Type="Edm.Int64">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The requested priority for this job."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the requested priority of this job.  The value `0` shall indicate the highest priority.  Increasing values shall represent decreasing priority."/>
+          <Annotation Term="Validation.Minimum" Int="0"/>
+        </Property>
+      </EntityType>
+
+      <EnumType Name="JobType">
+        <Member Name="DocumentBased">
+          <Annotation Term="OData.Description" String="A document-based job."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate a job that was created by performing the `SubmitJob` action on a `JobDocument` resource."/>
+        </Member>
+        <Member Name="UserSpecified">
+          <Annotation Term="OData.Description" String="A user-specified job."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate a job that was created by performing an HTTP `POST` operation on a `JobCollection` resource."/>
+        </Member>
+        <Member Name="ServiceGenerated">
+          <Annotation Term="OData.Description" String="A service-generated job."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate a job that was created automatically by the service as part of its internal policies."/>
+        </Member>
+      </EnumType>
+
+      <ComplexType Name="Parameters">
+        <Annotation Term="OData.AdditionalProperties" Bool="true"/>
+        <Annotation Term="OData.Description" String="The parameters used when running this instance of the job."/>
+        <Annotation Term="OData.LongDescription" String="This type shall contain the parameters to use when running this job.  Each property-value pair specifies a parameter and its value as specified when the job was submitted."/>
+        <Annotation Term="Redfish.DynamicPropertyPatterns">
+          <Collection>
+            <Record>
+              <PropertyValue Property="Pattern" String="^[A-Za-z][A-Za-z0-9_]+$"/>
+              <PropertyValue Property="Type" String="Edm.PrimitiveType"/>
+            </Record>
+          </Collection>
+        </Annotation>
+      </ComplexType>
+
+      <ComplexType Name="Links" BaseType="Job.v1_2_0.Links">
+        <NavigationProperty Name="ParentJob" Type="Job.Job">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The link to the job that created this job."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource of type `Job` that represents the job that created this job."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+        <NavigationProperty Name="JobDocument" Type="JobDocument.JobDocument">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="A link to the job document that was used to create this job."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource of type `JobDocument` that represents the job document that was used to create this job."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+        <NavigationProperty Name="SubsidiaryJobs" Type="Collection(Job.Job)">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="An array of links to the jobs created by this job."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an array of links to resources of type `Job` that represent the jobs created by this job."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+        <NavigationProperty Name="Executor" Type="JobExecutor.JobExecutor">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="A link to the executor that is running this job."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource of type `JobExecutor` that represents the executor that is running this job."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+        <NavigationProperty Name="PreferredExecutors" Type="Collection(JobExecutor.JobExecutor)">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="An array of links to the preferred executors to run this job."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an array of links to resources of type `JobExecutor` that represent the preferred executors to run this job."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+        <NavigationProperty Name="ValidatedExecutors" Type="Collection(JobExecutor.JobExecutor)">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="An array of links to the executors that have been validated to run this job."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an array of links to resources of type `JobExecutor` that represent the executors that have been validated to run this job."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+      </ComplexType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/LeakDetection_v1.xml b/redfish-core/schema/dmtf/csdl/LeakDetection_v1.xml
index be93842..3445ac5 100644
--- a/redfish-core/schema/dmtf/csdl/LeakDetection_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/LeakDetection_v1.xml
@@ -64,6 +64,7 @@
             <String>/redfish/v1/ThermalEquipment/CDUs/{CoolingUnitId}/LeakDetection</String>
             <String>/redfish/v1/ThermalEquipment/ImmersionUnits/{CoolingUnitId}/LeakDetection</String>
             <String>/redfish/v1/ThermalEquipment/HeatExchangers/{CoolingUnitId}/LeakDetection</String>
+            <String>/redfish/v1/ThermalEquipment/RPUs/{CoolingUnitId}/LeakDetection</String>
           </Collection>
         </Annotation>
       </EntityType>
diff --git a/redfish-core/schema/dmtf/csdl/LeakDetector_v1.xml b/redfish-core/schema/dmtf/csdl/LeakDetector_v1.xml
index ffbde2e..c0ee57a 100644
--- a/redfish-core/schema/dmtf/csdl/LeakDetector_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/LeakDetector_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  LeakDetector v1.3.0                                                 -->
+<!--# Redfish Schema:  LeakDetector v1.4.0                                                 -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -257,5 +257,44 @@
       </EntityType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="LeakDetector.v1_4_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2025.2"/>
+
+      <EntityType Name="LeakDetector" BaseType="LeakDetector.v1_3_0.LeakDetector">
+        <Property Name="CriticalReactionType" Type="LeakDetector.v1_4_0.ReactionType" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="The reaction to perform when a critical leak is detected."/>
+          <Annotation Term="OData.LongDescription" String="The reaction that shall be performed when the `DetectorState` property changes to `Critical`."/>
+        </Property>
+        <Property Name="WarningReactionType" Type="LeakDetector.v1_4_0.ReactionType" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="The reaction to perform when a warning-level leak is detected."/>
+          <Annotation Term="OData.LongDescription" String="The reaction that shall be performed when the `DetectorState` property changes to `Warning`."/>
+        </Property>
+        <Property Name="ReactionDelaySeconds" Type="Edm.Int64" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="The delay in seconds after a leak is detected before the selected reaction is executed."/>
+          <Annotation Term="OData.LongDescription" String="The value shall indicate the number of seconds to delay after the `DetectorState` changes before the selected reaction is executed.  If the `DetectorState` returns to `OK` prior to the delay value, the service shall not perform the reaction."/>
+          <Annotation Term="Measures.Unit" String="s"/>
+        </Property>
+      </EntityType>
+
+      <EnumType Name="ReactionType">
+        <Member Name="None">
+          <Annotation Term="OData.Description" String="No reaction."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate no reaction occurs when a leak is detected."/>
+        </Member>
+        <Member Name="ForceOff">
+          <Annotation Term="OData.Description" String="Forcefully shut down the device, equipment, or system."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate that the associated device, equipment, or system monitored by this leak detector is forcefully shut down when a leak is detected."/>
+        </Member>
+        <Member Name="GracefulShutdown">
+          <Annotation Term="OData.Description" String="Gracefully shut down the device, equipment, or system."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate that the associated device, equipment, or system monitored by this leak detector is gracefully shut down when a leak is detected."/>
+        </Member>
+      </EnumType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/LogEntry_v1.xml b/redfish-core/schema/dmtf/csdl/LogEntry_v1.xml
index e2e3a93..0196ff2 100644
--- a/redfish-core/schema/dmtf/csdl/LogEntry_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/LogEntry_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  LogEntry v1.18.0                                                    -->
+<!--# Redfish Schema:  LogEntry v1.19.0                                                    -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -2138,5 +2138,23 @@
       <EntityType Name="LogEntry" BaseType="LogEntry.v1_17_2.LogEntry"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="LogEntry.v1_19_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2025.2"/>
+
+      <EntityType Name="LogEntry" BaseType="LogEntry.v1_18_0.LogEntry">
+        <Property Name="SerialNumber" Type="Edm.String">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The serial number associated with the source of this log entry."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a manufacturer-allocated number that identifies the source of this log entry."/>
+        </Property>
+        <Property Name="PartNumber" Type="Edm.String">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The part number associated with the source of this log entry."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the manufacturer-provided part number for the source of this log entry."/>
+        </Property>
+      </EntityType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/ManagerAccount_v1.xml b/redfish-core/schema/dmtf/csdl/ManagerAccount_v1.xml
index 91d7572..8c709b6 100644
--- a/redfish-core/schema/dmtf/csdl/ManagerAccount_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/ManagerAccount_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  ManagerAccount v1.13.0                                              -->
+<!--# Redfish Schema:  ManagerAccount v1.14.0                                              -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -234,6 +234,18 @@
             </Collection>
           </Annotation>
         </Member>
+        <Member Name="ControlPanel">
+          <Annotation Term="OData.Description" String="Allow PIN-based access via an external control panel, such as a keypad, touchscreen, or other human interface."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the account is used to allow PIN-based access via an external control panel.  If this value is specified, the `AccountTypes` property should not contain other values for the same `ManagerAccount` resource.  If this value is specified, `Password` shall contain the PIN to enable access, and may not follow other password-related rules.  The `ChangePassword` action, if supported, may be used to update the PIN."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_14_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
       </EnumType>
     </Schema>
 
@@ -1177,5 +1189,13 @@
       </ComplexType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ManagerAccount.v1_14_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2025.2"/>
+      <Annotation Term="OData.Description" String="This version was created to add `ControlPanel` to `AccountTypes`."/>
+
+      <EntityType Name="ManagerAccount" BaseType="ManagerAccount.v1_13_0.ManagerAccount"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/ManagerNetworkProtocol_v1.xml b/redfish-core/schema/dmtf/csdl/ManagerNetworkProtocol_v1.xml
index 5f52d37..73e1819 100644
--- a/redfish-core/schema/dmtf/csdl/ManagerNetworkProtocol_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/ManagerNetworkProtocol_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  ManagerNetworkProtocol v1.11.0                                      -->
+<!--# Redfish Schema:  ManagerNetworkProtocol v1.12.0                                      -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -1003,5 +1003,54 @@
       </EntityType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ManagerNetworkProtocol.v1_12_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2025.2"/>
+
+      <EntityType Name="ManagerNetworkProtocol" BaseType="ManagerNetworkProtocol.v1_11_0.ManagerNetworkProtocol">
+        <Property Name="Modbus" Type="ManagerNetworkProtocol.v1_12_0.ModbusProtocol" Nullable="false">
+          <Annotation Term="OData.Description" String="The settings for this manager's Modbus TCP protocol support."/>
+          <Annotation Term="OData.LongDescription" String="This object shall contain the Modbus TCP protocol settings for the manager."/>
+        </Property>
+      </EntityType>
+
+      <ComplexType Name="ModbusProtocol" BaseType="ManagerNetworkProtocol.v1_0_0.Protocol">
+        <Property Name="ServerId" Type="Edm.Int64">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="The server identifier for this Modbus TCP protocol interface."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the Modbus Messaging On TCP/IP Implementation Guide-defined 'Unit Identifier' that identifies this Modbus TCP protocol server."/>
+          <Annotation Term="Validation.Minimum" Int="0"/>
+          <Annotation Term="Validation.Maximum" Int="255"/>
+        </Property>
+        <Property Name="MaximumConnectedClients" Type="Edm.Int64">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="The maximum number of simultaneously connected clients."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the maximum number of simultaneously connected clients to this Modbus TCP server."/>
+          <Annotation Term="Validation.Minimum" Int="0"/>
+        </Property>
+        <Property Name="NumberOfConnectedClients" Type="Edm.Int64">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The current number of connected clients."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the current number of connected clients to this Modbus TCP server."/>
+          <Annotation Term="Validation.Minimum" Int="0"/>
+        </Property>
+        <Property Name="ReadOnly" Type="Edm.Boolean">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="Indicates if the interface is read only."/>
+          <Annotation Term="OData.LongDescription" String="This property shall indicate if the Modbus TCP server protocol interface is read only.  If `true`, the Modbus TCP server service on this manager shall reject or ignore Modbus requests that modify data."/>
+        </Property>
+        <Property Name="RestrictAccessToAllowedClients" Type="Edm.Boolean">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="Indicates if access to this Modbus TCP server protocol interface is restricted to allowed clients."/>
+          <Annotation Term="OData.LongDescription" String="This property shall indicate if access to the Modbus TCP server protocol interface is restricted to allowed clients.  If `true`, the Modbus TCP server service on this manager shall restrict access to the list of clients defined by the `AllowedClients` property."/>
+        </Property>
+        <Property Name="AllowedClients" Type="Collection(Edm.String)">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="Indicates the list of allowed clients for this Modbus TCP server interface."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain all the clients allowed to access this Modbus TCP server interface.  If `RestrictAccessToAllowedClients` contains `true`, the service shall enforce this restriction.  If `RestrictAccessToAllowedClients` contains `false`, the service shall not enforce this restriction.  This property may contain FQDN, IPv4 addresses, IPv6 addresses, or any combination of those formats.  Services may reject unsupported formats."/>
+        </Property>
+      </ComplexType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/Manager_v1.xml b/redfish-core/schema/dmtf/csdl/Manager_v1.xml
index 1178804..828c437 100644
--- a/redfish-core/schema/dmtf/csdl/Manager_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/Manager_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  Manager v1.21.0                                                     -->
+<!--# Redfish Schema:  Manager v1.22.0                                                     -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -76,6 +76,9 @@
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/SecurityPolicy_v1.xml">
     <edmx:Include Namespace="SecurityPolicy"/>
   </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Fabric_v1.xml">
+    <edmx:Include Namespace="Fabric"/>
+  </edmx:Reference>
 
   <edmx:DataServices>
 
@@ -364,6 +367,17 @@
             </Collection>
           </Annotation>
         </Member>
+        <Member Name="FabricManager">
+          <Annotation Term="OData.Description" String="A controller that primarily monitors or manages the operation of a group of fabric attached nodes and switches."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_22_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
       </EnumType>
 
       <ComplexType Name="ManagerService" Abstract="true">
@@ -1999,5 +2013,21 @@
       </EnumType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_22_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2025.2"/>
+      <Annotation Term="OData.Description" String="This version was created to add `FabricManager` to `ManagerType`."/>
+
+      <EntityType Name="Manager" BaseType="Manager.v1_21_0.Manager"/>
+
+      <ComplexType Name="Links" BaseType="Manager.v1_18_0.Links">
+        <NavigationProperty Name="ManagerForFabrics" Type="Collection(Fabric.Fabric)">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="An array of links to the fabrics that this manager controls."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an array of links to resources of type `Fabric` that represent the fabrics that this manager controls."/>
+        </NavigationProperty>
+      </ComplexType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/Memory_v1.xml b/redfish-core/schema/dmtf/csdl/Memory_v1.xml
index 62276bc..0075de3 100644
--- a/redfish-core/schema/dmtf/csdl/Memory_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/Memory_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  Memory v1.20.0                                                      -->
+<!--# Redfish Schema:  Memory v1.21.0                                                      -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -826,6 +826,17 @@
             </Collection>
           </Annotation>
         </Member>
+        <Member Name="DDR5_MRDIMM">
+          <Annotation Term="OData.Description" String="DDR5 MRDIMM."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_21_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
       </EnumType>
 
       <EnumType Name="BaseModuleType">
@@ -870,6 +881,17 @@
             </Collection>
           </Annotation>
         </Member>
+        <Member Name="CAMM">
+          <Annotation Term="OData.Description" String="Compression Attached Memory Module."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_21_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
       </EnumType>
 
       <EnumType Name="MemoryMedia">
@@ -2464,5 +2486,13 @@
       </EntityType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Memory.v1_21_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2025.2"/>
+      <Annotation Term="OData.Description" String="This version was created to add `DDR5_MRDIMM` to `MemoryDeviceType`.  It was also created to add `CAMM` to `BaseModuleType`."/>
+
+      <EntityType Name="Memory" BaseType="Memory.v1_20_0.Memory"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/MetricDefinition_v1.xml b/redfish-core/schema/dmtf/csdl/MetricDefinition_v1.xml
index e737f1b..600ff82 100644
--- a/redfish-core/schema/dmtf/csdl/MetricDefinition_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/MetricDefinition_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  MetricDefinition v1.3.4                                             -->
+<!--# Redfish Schema:  MetricDefinition v1.3.5                                             -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -282,8 +282,8 @@
         </Property>
         <Property Name="Values" Type="Collection(Edm.String)">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
-          <Annotation Term="OData.Description" String="An array of values to substitute for the wildcard."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the list of values to substitute for the wildcard."/>
+          <Annotation Term="OData.Description" String="An array of values to substitute for the wildcard.  `*` indicates all possible values for the wildcard."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the list of values to substitute for the wildcard.  The value `*` shall indicate all possible values for the wildcard."/>
         </Property>
       </ComplexType>
 
@@ -403,6 +403,12 @@
       <EntityType Name="MetricDefinition" BaseType="MetricDefinition.v1_0_11.MetricDefinition"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MetricDefinition.v1_0_13">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify that `*` as a wildcard value indicates all possible values."/>
+      <EntityType Name="MetricDefinition" BaseType="MetricDefinition.v1_0_12.MetricDefinition"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MetricDefinition.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.3"/>
@@ -459,6 +465,12 @@
       <EntityType Name="MetricDefinition" BaseType="MetricDefinition.v1_1_6.MetricDefinition"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MetricDefinition.v1_1_8">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify that `*` as a wildcard value indicates all possible values."/>
+      <EntityType Name="MetricDefinition" BaseType="MetricDefinition.v1_1_7.MetricDefinition"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MetricDefinition.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2021.1"/>
@@ -497,6 +509,12 @@
       <EntityType Name="MetricDefinition" BaseType="MetricDefinition.v1_2_4.MetricDefinition"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MetricDefinition.v1_2_6">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify that `*` as a wildcard value indicates all possible values."/>
+      <EntityType Name="MetricDefinition" BaseType="MetricDefinition.v1_2_5.MetricDefinition"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MetricDefinition.v1_3_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2022.1"/>
@@ -534,5 +552,11 @@
       <EntityType Name="MetricDefinition" BaseType="MetricDefinition.v1_3_3.MetricDefinition"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MetricDefinition.v1_3_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify that `*` as a wildcard value indicates all possible values."/>
+      <EntityType Name="MetricDefinition" BaseType="MetricDefinition.v1_3_4.MetricDefinition"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/MetricReportDefinition_v1.xml b/redfish-core/schema/dmtf/csdl/MetricReportDefinition_v1.xml
index 82b7490..74ccb8f 100644
--- a/redfish-core/schema/dmtf/csdl/MetricReportDefinition_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/MetricReportDefinition_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  MetricReportDefinition v1.4.6                                       -->
+<!--# Redfish Schema:  MetricReportDefinition v1.4.7                                       -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -377,8 +377,8 @@
       <ComplexType Name="Wildcard" BaseType="MetricReportDefinition.v1_0_0.Wildcard">
         <Property Name="Values" Type="Collection(Edm.String)">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
-          <Annotation Term="OData.Description" String="An array of values to substitute for the wildcard."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the list of values to substitute for the wildcard."/>
+          <Annotation Term="OData.Description" String="An array of values to substitute for the wildcard.  `*` indicates all possible values for the wildcard."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the list of values to substitute for the wildcard.  The value `*` shall indicate all possible values for the wildcard."/>
         </Property>
       </ComplexType>
     </Schema>
@@ -455,6 +455,12 @@
       <EntityType Name="MetricReportDefinition" BaseType="MetricReportDefinition.v1_1_11.MetricReportDefinition"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MetricReportDefinition.v1_1_13">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify that `*` as a wildcard value indicates all possible values."/>
+      <EntityType Name="MetricReportDefinition" BaseType="MetricReportDefinition.v1_1_12.MetricReportDefinition"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MetricReportDefinition.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.1"/>
@@ -559,6 +565,12 @@
       <EntityType Name="MetricReportDefinition" BaseType="MetricReportDefinition.v1_2_10.MetricReportDefinition"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MetricReportDefinition.v1_2_12">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify that `*` as a wildcard value indicates all possible values."/>
+      <EntityType Name="MetricReportDefinition" BaseType="MetricReportDefinition.v1_2_11.MetricReportDefinition"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MetricReportDefinition.v1_3_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.2"/>
@@ -632,6 +644,12 @@
       <EntityType Name="MetricReportDefinition" BaseType="MetricReportDefinition.v1_3_9.MetricReportDefinition"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MetricReportDefinition.v1_3_11">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify that `*` as a wildcard value indicates all possible values."/>
+      <EntityType Name="MetricReportDefinition" BaseType="MetricReportDefinition.v1_3_10.MetricReportDefinition"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MetricReportDefinition.v1_4_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.4"/>
@@ -682,5 +700,11 @@
       <EntityType Name="MetricReportDefinition" BaseType="MetricReportDefinition.v1_4_5.MetricReportDefinition"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MetricReportDefinition.v1_4_7">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify that `*` as a wildcard value indicates all possible values."/>
+      <EntityType Name="MetricReportDefinition" BaseType="MetricReportDefinition.v1_4_6.MetricReportDefinition"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/NetworkAdapter_v1.xml b/redfish-core/schema/dmtf/csdl/NetworkAdapter_v1.xml
index f65feca..c89ff21 100644
--- a/redfish-core/schema/dmtf/csdl/NetworkAdapter_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/NetworkAdapter_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  NetworkAdapter v1.11.0                                              -->
+<!--# Redfish Schema:  NetworkAdapter v1.12.0                                              -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -72,7 +72,7 @@
 
       <EntityType Name="NetworkAdapter" BaseType="Resource.v1_0_0.Resource" Abstract="true">
         <Annotation Term="OData.Description" String="The `NetworkAdapter` schema represents a physical network adapter capable of connecting to a computer network.  Examples include but are not limited to Ethernet, Fibre Channel, and converged network adapters."/>
-        <Annotation Term="OData.LongDescription" String="This resource shall represent a physical network adapter capable of connecting to a computer network in a Redfish implementation."/>
+        <Annotation Term="OData.LongDescription" String="This resource shall represent a physical network adapter capable of connecting to a computer network in a Redfish implementation.  Services should represent adapters that contain multiple controllers with independent management interfaces as multiple `NetworkAdapter` resources."/>
         <Annotation Term="Capabilities.InsertRestrictions">
           <Record>
             <PropertyValue Property="Insertable" Bool="false"/>
@@ -395,6 +395,12 @@
       <EntityType Name="NetworkAdapter" BaseType="NetworkAdapter.v1_0_7.NetworkAdapter"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="NetworkAdapter.v1_0_9">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to provide guidance for multi-ASIC adapters."/>
+      <EntityType Name="NetworkAdapter" BaseType="NetworkAdapter.v1_0_8.NetworkAdapter"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="NetworkAdapter.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2017.3"/>
@@ -464,6 +470,12 @@
       <EntityType Name="NetworkAdapter" BaseType="NetworkAdapter.v1_1_7.NetworkAdapter"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="NetworkAdapter.v1_1_9">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to provide guidance for multi-ASIC adapters."/>
+      <EntityType Name="NetworkAdapter" BaseType="NetworkAdapter.v1_1_8.NetworkAdapter"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="NetworkAdapter.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2018.2"/>
@@ -541,6 +553,12 @@
       <EntityType Name="NetworkAdapter" BaseType="NetworkAdapter.v1_2_6.NetworkAdapter"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="NetworkAdapter.v1_2_8">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to provide guidance for multi-ASIC adapters."/>
+      <EntityType Name="NetworkAdapter" BaseType="NetworkAdapter.v1_2_7.NetworkAdapter"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="NetworkAdapter.v1_3_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.2"/>
@@ -591,6 +609,12 @@
       <EntityType Name="NetworkAdapter" BaseType="NetworkAdapter.v1_3_5.NetworkAdapter"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="NetworkAdapter.v1_3_7">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to provide guidance for multi-ASIC adapters."/>
+      <EntityType Name="NetworkAdapter" BaseType="NetworkAdapter.v1_3_6.NetworkAdapter"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="NetworkAdapter.v1_4_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.2"/>
@@ -625,6 +649,12 @@
       <EntityType Name="NetworkAdapter" BaseType="NetworkAdapter.v1_4_2.NetworkAdapter"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="NetworkAdapter.v1_4_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to provide guidance for multi-ASIC adapters."/>
+      <EntityType Name="NetworkAdapter" BaseType="NetworkAdapter.v1_4_3.NetworkAdapter"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="NetworkAdapter.v1_5_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.3"/>
@@ -666,6 +696,12 @@
       <EntityType Name="NetworkAdapter" BaseType="NetworkAdapter.v1_5_2.NetworkAdapter"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="NetworkAdapter.v1_5_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to provide guidance for multi-ASIC adapters."/>
+      <EntityType Name="NetworkAdapter" BaseType="NetworkAdapter.v1_5_3.NetworkAdapter"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="NetworkAdapter.v1_6_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.4"/>
@@ -705,6 +741,12 @@
       <EntityType Name="NetworkAdapter" BaseType="NetworkAdapter.v1_6_1.NetworkAdapter"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="NetworkAdapter.v1_6_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to provide guidance for multi-ASIC adapters."/>
+      <EntityType Name="NetworkAdapter" BaseType="NetworkAdapter.v1_6_2.NetworkAdapter"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="NetworkAdapter.v1_7_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2021.1"/>
@@ -742,6 +784,12 @@
       <EntityType Name="NetworkAdapter" BaseType="NetworkAdapter.v1_7_1.NetworkAdapter"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="NetworkAdapter.v1_7_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to provide guidance for multi-ASIC adapters."/>
+      <EntityType Name="NetworkAdapter" BaseType="NetworkAdapter.v1_7_2.NetworkAdapter"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="NetworkAdapter.v1_8_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2021.2"/>
@@ -768,6 +816,12 @@
       <EntityType Name="NetworkAdapter" BaseType="NetworkAdapter.v1_8_1.NetworkAdapter"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="NetworkAdapter.v1_8_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to provide guidance for multi-ASIC adapters."/>
+      <EntityType Name="NetworkAdapter" BaseType="NetworkAdapter.v1_8_2.NetworkAdapter"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="NetworkAdapter.v1_9_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2021.4"/>
@@ -788,6 +842,12 @@
       <EntityType Name="NetworkAdapter" BaseType="NetworkAdapter.v1_9_1.NetworkAdapter"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="NetworkAdapter.v1_9_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to provide guidance for multi-ASIC adapters."/>
+      <EntityType Name="NetworkAdapter" BaseType="NetworkAdapter.v1_9_2.NetworkAdapter"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="NetworkAdapter.v1_10_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2023.3"/>
@@ -816,6 +876,12 @@
       <EntityType Name="NetworkAdapter" BaseType="NetworkAdapter.v1_10_0.NetworkAdapter"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="NetworkAdapter.v1_10_2">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to provide guidance for multi-ASIC adapters."/>
+      <EntityType Name="NetworkAdapter" BaseType="NetworkAdapter.v1_10_1.NetworkAdapter"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="NetworkAdapter.v1_11_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2024.1"/>
@@ -824,5 +890,32 @@
       <EntityType Name="NetworkAdapter" BaseType="NetworkAdapter.v1_10_1.NetworkAdapter"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="NetworkAdapter.v1_11_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to provide guidance for multi-ASIC adapters."/>
+      <EntityType Name="NetworkAdapter" BaseType="NetworkAdapter.v1_11_0.NetworkAdapter"/>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="NetworkAdapter.v1_12_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2025.2"/>
+
+      <EntityType Name="NetworkAdapter" BaseType="NetworkAdapter.v1_11_0.NetworkAdapter"/>
+
+      <ComplexType Name="SRIOV" BaseType="NetworkAdapter.v1_0_0.SRIOV">
+        <Property Name="SRIOVEnabled" Type="Edm.Boolean" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="An indication of whether single root input/output virtualization (SR-IOV) is enabled for this controller."/>
+          <Annotation Term="OData.LongDescription" String="This property shall indicate whether single root input/output virtualization (SR-IOV) is enabled for this controller."/>
+        </Property>
+      </ComplexType>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="NetworkAdapter.v1_12_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to provide guidance for multi-ASIC adapters."/>
+      <EntityType Name="NetworkAdapter" BaseType="NetworkAdapter.v1_11_0.NetworkAdapter"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/NetworkDeviceFunction_v1.xml b/redfish-core/schema/dmtf/csdl/NetworkDeviceFunction_v1.xml
index 8f644a9..8654a49 100644
--- a/redfish-core/schema/dmtf/csdl/NetworkDeviceFunction_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/NetworkDeviceFunction_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  NetworkDeviceFunction v1.10.0                                       -->
+<!--# Redfish Schema:  NetworkDeviceFunction v1.11.0                                       -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -1265,5 +1265,18 @@
       </ComplexType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="NetworkDeviceFunction.v1_11_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2025.2"/>
+
+      <EntityType Name="NetworkDeviceFunction" BaseType="NetworkDeviceFunction.v1_10_0.NetworkDeviceFunction">
+        <Property Name="VirtualFunctionAllocation" Type="Edm.Int64" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="The number of virtual functions allocated to this device."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the number virtual functions allocated to this device.  This property should contain a value that is a multiple of the value contained by the `MinAssignmentGroupSize` property of the corresponding `Controllers` array member within the parent `NetworkAdapter` resource.  The value shall not exceed the value contained in the `MaxVirtualFunctions` property."/>
+        </Property>
+      </EntityType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/PCIeDevice_v1.xml b/redfish-core/schema/dmtf/csdl/PCIeDevice_v1.xml
index eff9550..d998e7f 100644
--- a/redfish-core/schema/dmtf/csdl/PCIeDevice_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/PCIeDevice_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  PCIeDevice v1.18.0                                                  -->
+<!--# Redfish Schema:  PCIeDevice v1.19.0                                                  -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -52,6 +52,9 @@
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Processor_v1.xml">
     <edmx:Include Namespace="Processor"/>
   </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Port_v1.xml">
+    <edmx:Include Namespace="Port"/>
+  </edmx:Reference>
 
   <edmx:DataServices>
 
@@ -1216,5 +1219,21 @@
       </EnumType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="PCIeDevice.v1_19_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2025.2"/>
+
+      <EntityType Name="PCIeDevice" BaseType="PCIeDevice.v1_18_0.PCIeDevice"/>
+
+      <ComplexType Name="Links" BaseType="PCIeDevice.v1_12_0.Links">
+        <NavigationProperty Name="ConnectedPCIePorts" Type="Collection(Port.Port)">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="An array of links to the remote PCIe ports to which this device is connected."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an array of links to resources of type `Port` that represent the remote PCIe ports to which this device is connected."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+      </ComplexType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/PortCollection_v1.xml b/redfish-core/schema/dmtf/csdl/PortCollection_v1.xml
index d17e720..1ba8612 100644
--- a/redfish-core/schema/dmtf/csdl/PortCollection_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/PortCollection_v1.xml
@@ -58,8 +58,8 @@
             <String>/redfish/v1/Systems/{ComputerSystemId}/Storage/{StorageId}/Controllers/{StorageControllerId}/Ports</String>
             <String>/redfish/v1/Systems/{ComputerSystemId}/FabricAdapters/{FabricAdapterId}/Ports</String>
             <String>/redfish/v1/Systems/{ComputerSystemId}/NetworkInterfaces/{NetworkInterfaceId}/Ports</String>
-            <String>/redfish/v1/Systems/{ComputerSystemId}/GraphicsControllers/{ControllerId}/Ports</String>
-            <String>/redfish/v1/Systems/{ComputerSystemId}/USBControllers/{ControllerId}/Ports</String>
+            <String>/redfish/v1/Systems/{ComputerSystemId}/GraphicsControllers/{GraphicsControllerId}/Ports</String>
+            <String>/redfish/v1/Systems/{ComputerSystemId}/USBControllers/{USBControllerId}/Ports</String>
             <String>/redfish/v1/Systems/{ComputerSystemId}/Processors/{ProcessorId}/Ports</String>
             <String>/redfish/v1/Chassis/{ChassisId}/MediaControllers/{MediaControllerId}/Ports</String>
             <String>/redfish/v1/Chassis/{ChassisId}/FabricAdapters/{FabricAdapterId}/Ports</String>
@@ -72,8 +72,8 @@
             <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/Controllers/{StorageControllerId}/Ports</String>
             <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/FabricAdapters/{FabricAdapterId}/Ports</String>
             <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/NetworkInterfaces/{NetworkInterfaceId}/Ports</String>
-            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/GraphicsControllers/{ControllerId}/Ports</String>
-            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/USBControllers/{ControllerId}/Ports</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/GraphicsControllers/{GraphicsControllerId}/Ports</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/USBControllers/{USBControllerId}/Ports</String>
             <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Processors/{ProcessorId}/Ports</String>
             <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/StorageControllers/{StorageControllerId}/Ports</String>
             <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/Controllers/{StorageControllerId}/Ports</String>
@@ -83,8 +83,8 @@
             <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/Controllers/{StorageControllerId}/Ports</String>
             <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/FabricAdapters/{FabricAdapterId}/Ports</String>
             <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/NetworkInterfaces/{NetworkInterfaceId}/Ports</String>
-            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/GraphicsControllers/{ControllerId}/Ports</String>
-            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/USBControllers/{ControllerId}/Ports</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/GraphicsControllers/{GraphicsControllerId}/Ports</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/USBControllers/{USBControllerId}/Ports</String>
             <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Processors/{ProcessorId}/Ports</String>
             <String>/redfish/v1/Storage/{StorageId}/StorageControllers/{StorageControllerId}/Ports</String>
             <String>/redfish/v1/Storage/{StorageId}/Controllers/{StorageControllerId}/Ports</String>
diff --git a/redfish-core/schema/dmtf/csdl/PortMetrics_v1.xml b/redfish-core/schema/dmtf/csdl/PortMetrics_v1.xml
index 2fba6f6..9f9d8ae 100644
--- a/redfish-core/schema/dmtf/csdl/PortMetrics_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/PortMetrics_v1.xml
@@ -62,8 +62,8 @@
             <String>/redfish/v1/Systems/{ComputerSystemId}/Storage/{StorageId}/StorageControllers/{StorageControllerId}/Ports/{PortId}/Metrics</String>
             <String>/redfish/v1/Systems/{ComputerSystemId}/Storage/{StorageId}/Controllers/{StorageControllerId}/Ports/{PortId}/Metrics</String>
             <String>/redfish/v1/Systems/{ComputerSystemId}/FabricAdapters/{FabricAdapterId}/Ports/{PortId}/Metrics</String>
-            <String>/redfish/v1/Systems/{ComputerSystemId}/GraphicsControllers/{ControllerId}/Ports/{PortId}/Metrics</String>
-            <String>/redfish/v1/Systems/{ComputerSystemId}/USBControllers/{ControllerId}/Ports/{PortId}/Metrics</String>
+            <String>/redfish/v1/Systems/{ComputerSystemId}/GraphicsControllers/{GraphicsControllerId}/Ports/{PortId}/Metrics</String>
+            <String>/redfish/v1/Systems/{ComputerSystemId}/USBControllers/{USBControllerId}/Ports/{PortId}/Metrics</String>
             <String>/redfish/v1/Systems/{ComputerSystemId}/Processors/{ProcessorId}/Ports/{PortId}/Metrics</String>
             <String>/redfish/v1/Chassis/{ChassisId}/MediaControllers/{MediaControllerId}/Ports/{PortId}/Metrics</String>
             <String>/redfish/v1/Chassis/{ChassisId}/FabricAdapters/{FabricAdapterId}/Ports/{PortId}/Metrics</String>
@@ -74,8 +74,8 @@
             <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/StorageControllers/{StorageControllerId}/Ports/{PortId}/Metrics</String>
             <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/Controllers/{StorageControllerId}/Ports/{PortId}/Metrics</String>
             <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/FabricAdapters/{FabricAdapterId}/Ports/{PortId}/Metrics</String>
-            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/GraphicsControllers/{ControllerId}/Ports/{PortId}/Metrics</String>
-            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/USBControllers/{ControllerId}/Ports/{PortId}/Metrics</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/GraphicsControllers/{GraphicsControllerId}/Ports/{PortId}/Metrics</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/USBControllers/{USBControllerId}/Ports/{PortId}/Metrics</String>
             <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Processors/{ProcessorId}/Ports/{PortId}/Metrics</String>
             <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/StorageControllers/{StorageControllerId}/Ports/{PortId}/Metrics</String>
             <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/Controllers/{StorageControllerId}/Ports/{PortId}/Metrics</String>
@@ -83,8 +83,8 @@
             <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/StorageControllers/{StorageControllerId}/Ports/{PortId}/Metrics</String>
             <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/Controllers/{StorageControllerId}/Ports/{PortId}/Metrics</String>
             <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/FabricAdapters/{FabricAdapterId}/Ports/{PortId}/Metrics</String>
-            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/GraphicsControllers/{ControllerId}/Ports/{PortId}/Metrics</String>
-            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/USBControllers/{ControllerId}/Ports/{PortId}/Metrics</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/GraphicsControllers/{GraphicsControllerId}/Ports/{PortId}/Metrics</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/USBControllers/{USBControllerId}/Ports/{PortId}/Metrics</String>
             <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Processors/{ProcessorId}/Ports/{PortId}/Metrics</String>
             <String>/redfish/v1/Storage/{StorageId}/StorageControllers/{StorageControllerId}/Ports/{PortId}/Metrics</String>
             <String>/redfish/v1/Storage/{StorageId}/Controllers/{StorageControllerId}/Ports/{PortId}/Metrics</String>
diff --git a/redfish-core/schema/dmtf/csdl/Port_v1.xml b/redfish-core/schema/dmtf/csdl/Port_v1.xml
index 85faabd..dc0b5b7 100644
--- a/redfish-core/schema/dmtf/csdl/Port_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/Port_v1.xml
@@ -89,8 +89,8 @@
             <String>/redfish/v1/Systems/{ComputerSystemId}/Storage/{StorageId}/StorageControllers/{StorageControllerId}/Ports/{PortId}</String>
             <String>/redfish/v1/Systems/{ComputerSystemId}/Storage/{StorageId}/Controllers/{StorageControllerId}/Ports/{PortId}</String>
             <String>/redfish/v1/Systems/{ComputerSystemId}/FabricAdapters/{FabricAdapterId}/Ports/{PortId}</String>
-            <String>/redfish/v1/Systems/{ComputerSystemId}/GraphicsControllers/{ControllerId}/Ports/{PortId}</String>
-            <String>/redfish/v1/Systems/{ComputerSystemId}/USBControllers/{ControllerId}/Ports/{PortId}</String>
+            <String>/redfish/v1/Systems/{ComputerSystemId}/GraphicsControllers/{GraphicsControllerId}/Ports/{PortId}</String>
+            <String>/redfish/v1/Systems/{ComputerSystemId}/USBControllers/{USBControllerId}/Ports/{PortId}</String>
             <String>/redfish/v1/Systems/{ComputerSystemId}/Processors/{ProcessorId}/Ports/{PortId}</String>
             <String>/redfish/v1/Chassis/{ChassisId}/MediaControllers/{MediaControllerId}/Ports/{PortId}</String>
             <String>/redfish/v1/Chassis/{ChassisId}/FabricAdapters/{FabricAdapterId}/Ports/{PortId}</String>
@@ -101,8 +101,8 @@
             <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/StorageControllers/{StorageControllerId}/Ports/{PortId}</String>
             <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/Controllers/{StorageControllerId}/Ports/{PortId}</String>
             <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/FabricAdapters/{FabricAdapterId}/Ports/{PortId}</String>
-            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/GraphicsControllers/{ControllerId}/Ports/{PortId}</String>
-            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/USBControllers/{ControllerId}/Ports/{PortId}</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/GraphicsControllers/{GraphicsControllerId}/Ports/{PortId}</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/USBControllers/{USBControllerId}/Ports/{PortId}</String>
             <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Processors/{ProcessorId}/Ports/{PortId}</String>
             <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/StorageControllers/{StorageControllerId}/Ports/{PortId}</String>
             <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/Controllers/{StorageControllerId}/Ports/{PortId}</String>
@@ -110,8 +110,8 @@
             <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/StorageControllers/{StorageControllerId}/Ports/{PortId}</String>
             <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/Controllers/{StorageControllerId}/Ports/{PortId}</String>
             <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/FabricAdapters/{FabricAdapterId}/Ports/{PortId}</String>
-            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/GraphicsControllers/{ControllerId}/Ports/{PortId}</String>
-            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/USBControllers/{ControllerId}/Ports/{PortId}</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/GraphicsControllers/{GraphicsControllerId}/Ports/{PortId}</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/USBControllers/{USBControllerId}/Ports/{PortId}</String>
             <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Processors/{ProcessorId}/Ports/{PortId}</String>
             <String>/redfish/v1/Storage/{StorageId}/StorageControllers/{StorageControllerId}/Ports/{PortId}</String>
             <String>/redfish/v1/Storage/{StorageId}/Controllers/{StorageControllerId}/Ports/{PortId}</String>
diff --git a/redfish-core/schema/dmtf/csdl/Protocol_v1.xml b/redfish-core/schema/dmtf/csdl/Protocol_v1.xml
index 4ec1f25..3ee0a9f 100644
--- a/redfish-core/schema/dmtf/csdl/Protocol_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/Protocol_v1.xml
@@ -374,8 +374,8 @@
             </Collection>
           </Annotation>
         </Member>
-        <Member Name="UEC">
-          <Annotation Term="OData.Description" String="Ultra Ethernet (UEC)."/>
+        <Member Name="UET">
+          <Annotation Term="OData.Description" String="Ultra Ethernet Transport."/>
           <Annotation Term="OData.LongDescription" String="This value shall indicate conformance to the Ultra Ethernet specifications."/>
           <Annotation Term="Redfish.Revisions">
             <Collection>
diff --git a/redfish-core/schema/dmtf/csdl/PumpCollection_v1.xml b/redfish-core/schema/dmtf/csdl/PumpCollection_v1.xml
index 84acec4..436cdd2 100644
--- a/redfish-core/schema/dmtf/csdl/PumpCollection_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/PumpCollection_v1.xml
@@ -56,6 +56,7 @@
             <String>/redfish/v1/ThermalEquipment/CDUs/{CoolingUnitId}/Pumps</String>
             <String>/redfish/v1/ThermalEquipment/ImmersionUnits/{CoolingUnitId}/Pumps</String>
             <String>/redfish/v1/ThermalEquipment/HeatExchangers/{CoolingUnitId}/Pumps</String>
+            <String>/redfish/v1/ThermalEquipment/RPUs/{CoolingUnitId}/Pumps</String>
             <String>/redfish/v1/Chassis/{ChassisId}/ThermalSubsystem/Pumps</String>
           </Collection>
         </Annotation>
diff --git a/redfish-core/schema/dmtf/csdl/Pump_v1.xml b/redfish-core/schema/dmtf/csdl/Pump_v1.xml
index 1722a5e..0a5b910 100644
--- a/redfish-core/schema/dmtf/csdl/Pump_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/Pump_v1.xml
@@ -82,6 +82,7 @@
             <String>/redfish/v1/ThermalEquipment/CDUs/{CoolingUnitId}/Pumps/{PumpId}</String>
             <String>/redfish/v1/ThermalEquipment/ImmersionUnits/{CoolingUnitId}/Pumps/{PumpId}</String>
             <String>/redfish/v1/ThermalEquipment/HeatExchangers/{CoolingUnitId}/Pumps/{PumpId}</String>
+            <String>/redfish/v1/ThermalEquipment/RPUs/{CoolingUnitId}/Pumps/{PumpId}</String>
             <String>/redfish/v1/Chassis/{ChassisId}/ThermalSubsystem/Pumps/{PumpId}</String>
           </Collection>
         </Annotation>
diff --git a/redfish-core/schema/dmtf/csdl/ReservoirCollection_v1.xml b/redfish-core/schema/dmtf/csdl/ReservoirCollection_v1.xml
index 35e2a45..425df1e 100644
--- a/redfish-core/schema/dmtf/csdl/ReservoirCollection_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/ReservoirCollection_v1.xml
@@ -56,6 +56,7 @@
             <String>/redfish/v1/ThermalEquipment/CDUs/{CoolingUnitId}/Reservoirs</String>
             <String>/redfish/v1/ThermalEquipment/ImmersionUnits/{CoolingUnitId}/Reservoirs</String>
             <String>/redfish/v1/ThermalEquipment/HeatExchangers/{CoolingUnitId}/Reservoirs</String>
+            <String>/redfish/v1/ThermalEquipment/RPUs/{CoolingUnitId}/Reservoirs</String>
           </Collection>
         </Annotation>
         <NavigationProperty Name="Members" Type="Collection(Reservoir.Reservoir)">
diff --git a/redfish-core/schema/dmtf/csdl/Reservoir_v1.xml b/redfish-core/schema/dmtf/csdl/Reservoir_v1.xml
index 0690435..8654e19 100644
--- a/redfish-core/schema/dmtf/csdl/Reservoir_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/Reservoir_v1.xml
@@ -82,6 +82,7 @@
             <String>/redfish/v1/ThermalEquipment/CDUs/{CoolingUnitId}/Reservoirs/{ReservoirId}</String>
             <String>/redfish/v1/ThermalEquipment/ImmersionUnits/{CoolingUnitId}/Reservoirs/{ReservoirId}</String>
             <String>/redfish/v1/ThermalEquipment/HeatExchangers/{CoolingUnitId}/Reservoirs/{ReservoirId}</String>
+            <String>/redfish/v1/ThermalEquipment/RPUs/{CoolingUnitId}/Reservoirs/{ReservoirId}</String>
           </Collection>
         </Annotation>
       </EntityType>
diff --git a/redfish-core/schema/dmtf/csdl/Resource_v1.xml b/redfish-core/schema/dmtf/csdl/Resource_v1.xml
index 5b87245..83215c7 100644
--- a/redfish-core/schema/dmtf/csdl/Resource_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/Resource_v1.xml
@@ -228,6 +228,19 @@
             </Collection>
           </Annotation>
         </Property>
+        <Property Name="ConditionType" Type="Resource.v1_22_0.ConditionType">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The type of condition."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the type of condition."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_22_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Property>
         <Property Name="Oem" Type="Resource.Oem" Nullable="false">
           <Annotation Term="OData.Description" String="The OEM extension property."/>
           <Annotation Term="OData.LongDescription" String="This property shall contain the OEM extensions.  All values for properties contained in this object shall conform to the Redfish Specification-described requirements."/>
@@ -2199,10 +2212,10 @@
       <Annotation Term="OData.Description" String="This version was created to deprecate PostalAddress in Location in favor of `PhysicalAddress`."/>
 
       <ComplexType Name="Location" BaseType="Resource.v1_16_0.Location">
-         <Property Name="PhysicalAddress" Type="Resource.v1_17_0.PhysicalAddress" Nullable="false">
-            <Annotation Term="OData.Description" String="The physical address for a resource."/>
-            <Annotation Term="OData.LongDescription" String="This property shall contain a physical address for a resource.  This property should be present for resources that represent physical objects that can operate without requiring physical containment by another resource.  For example, a server chassis might be contained by a rack, but it might also be deployed individually, while a drive is always contained by a chassis and therefore is described by the containing resource."/>
-         </Property>
+        <Property Name="PhysicalAddress" Type="Resource.v1_17_0.PhysicalAddress" Nullable="false">
+          <Annotation Term="OData.Description" String="The physical address for a resource."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a physical address for a resource.  This property should be present for resources that represent physical objects that can operate without requiring physical containment by another resource.  For example, a server chassis might be contained by a rack, but it might also be deployed individually, while a drive is always contained by a chassis and therefore is described by the containing resource."/>
+        </Property>
       </ComplexType>
 
       <ComplexType Name="PhysicalAddress">
@@ -2322,5 +2335,26 @@
       <Annotation Term="OData.Description" String="This version was created to add the `FullPowerCycle` enumeration to `ResetType`.  It was also created to add the `Oem` property to the `Condition` property in `Status`."/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_22_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2025.2"/>
+      <Annotation Term="OData.Description" String="This version was created to add the `ConditionType` to `Conditions` within `Status`."/>
+
+      <EnumType Name="ConditionType">
+        <Member Name="Alert">
+          <Annotation Term="OData.Description" String="The condition is an alert."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate a condition that requires correction, such as a fault."/>
+        </Member>
+        <Member Name="Informational">
+          <Annotation Term="OData.Description" String="The condition is informational."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate a condition that requires attention, maintenance, or some other user intervention, such as performing a reset to activate new firmware."/>
+        </Member>
+        <Member Name="Subsystem">
+          <Annotation Term="OData.Description" String="The condition is the health of a subsystem."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate a condition that contains the health of a subsystem.  If supported by the service, the service shall always provide this condition in responses."/>
+        </Member>
+      </EnumType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/Sensor_v1.xml b/redfish-core/schema/dmtf/csdl/Sensor_v1.xml
index 67f185a..07a43ba 100644
--- a/redfish-core/schema/dmtf/csdl/Sensor_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/Sensor_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  Sensor v1.10.1                                                      -->
+<!--# Redfish Schema:  Sensor v1.11.0                                                      -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -220,13 +220,13 @@
           <Annotation Term="OData.LongDescription" String="This property shall contain the units of the sensor's reading, thresholds, and other reading-related properties.  The value shall follow the case-sensitive symbol format defined by the Unified Code for Units of Measure (UCUM), as specified by the 'Units of measure annotation' clause of the Redfish Specification."/>
         </Property>
         <Property Name="PhysicalContext" Type="PhysicalContext.PhysicalContext">
-          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
           <Annotation Term="OData.Description" String="The area or device to which this sensor measurement applies."/>
           <Annotation Term="OData.LongDescription" String="This property shall contain a description of the affected component or region within the equipment to which this sensor measurement applies."/>
           <Annotation Term="Redfish.Excerpt" String="Array,FanArray,PowerArray"/>
         </Property>
         <Property Name="PhysicalSubContext" Type="PhysicalContext.PhysicalSubContext">
-          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
           <Annotation Term="OData.Description" String="The usage or location within a device to which this sensor measurement applies."/>
           <Annotation Term="OData.LongDescription" String="This property shall contain a description of the usage or sub-region within the equipment to which this sensor measurement applies.  This property generally differentiates multiple sensors within the same `PhysicalContext` instance."/>
           <Annotation Term="Redfish.Excerpt" String="Array,FanArray,PowerArray"/>
@@ -668,6 +668,90 @@
             </Collection>
           </Annotation>
         </Member>
+        <Member Name="LinearPosition">
+          <Annotation Term="OData.Description" String="Linear position or distance (m)."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate a linear position or distance, in meter units.  The `ReadingUnits` property shall contain `m`."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_11_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
+        <Member Name="LinearVelocity">
+          <Annotation Term="OData.Description" String="Linear velocity (m/s)."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate a linear velocity, in meters per second units.  The `ReadingUnits` property shall contain `m/s`."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_11_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
+        <Member Name="LinearAcceleration">
+          <Annotation Term="OData.Description" String="Linear acceleration (m/s^2)."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate a linear acceleration, in meters per square second units.  The `ReadingUnits` property shall contain `m/s2`."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_11_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
+        <Member Name="RotationalPosition">
+          <Annotation Term="OData.Description" String="Rotational position (rad)."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate a rotational position, in radian units.  The `ReadingUnits` property shall contain `rad`."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_11_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
+        <Member Name="RotationalVelocity">
+          <Annotation Term="OData.Description" String="Rotational velocity (rad/s)."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate a rotational velocity, in radians per second units.  The `ReadingUnits` property shall contain `rad/s`."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_11_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
+        <Member Name="RotationalAcceleration">
+          <Annotation Term="OData.Description" String="Rotational acceleration (rad/s^2)."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate a rotational acceleration, in radians per square second units.  The `ReadingUnits` property shall contain `rad/s2`."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_11_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
+        <Member Name="Valve">
+          <Annotation Term="OData.Description" String="Valve (% open)."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate a valve position, in percent units.  The `ReadingUnits` property shall contain `%`.  A value of `100` shall indicate the valve is completely open, and a value of `0` shall indicate the valve is completely closed."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_11_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
       </EnumType>
     </Schema>
 
@@ -743,6 +827,12 @@
       <EntityType Name="Sensor" BaseType="Sensor.v1_0_11.Sensor"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Sensor.v1_0_13">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to change the permissions for `RelatedItem`, `PhysicalContext`, and `PhysicalSubContext` to read-write."/>
+      <EntityType Name="Sensor" BaseType="Sensor.v1_0_12.Sensor"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Sensor.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.4"/>
@@ -847,6 +937,12 @@
       <EntityType Name="Sensor" BaseType="Sensor.v1_1_7.Sensor"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Sensor.v1_1_9">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to change the permissions for `RelatedItem`, `PhysicalContext`, and `PhysicalSubContext` to read-write."/>
+      <EntityType Name="Sensor" BaseType="Sensor.v1_1_8.Sensor"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Sensor.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.4"/>
@@ -854,7 +950,7 @@
 
       <EntityType Name="Sensor" BaseType="Sensor.v1_1_1.Sensor">
         <NavigationProperty Name="RelatedItem" Type="Collection(Resource.Item)">
-          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
           <Annotation Term="OData.Description" String="An array of links to resources or objects that this sensor services."/>
           <Annotation Term="OData.LongDescription" String="This property shall contain an array of links to resources or objects that this sensor services."/>
           <Annotation Term="OData.AutoExpandReferences"/>
@@ -931,6 +1027,12 @@
       <EntityType Name="Sensor" BaseType="Sensor.v1_2_5.Sensor"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Sensor.v1_2_7">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to change the permissions for `RelatedItem`, `PhysicalContext`, and `PhysicalSubContext` to read-write."/>
+      <EntityType Name="Sensor" BaseType="Sensor.v1_2_6.Sensor"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Sensor.v1_3_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2021.1"/>
@@ -984,6 +1086,12 @@
       <EntityType Name="Sensor" BaseType="Sensor.v1_3_5.Sensor"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Sensor.v1_3_7">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to change the permissions for `RelatedItem`, `PhysicalContext`, and `PhysicalSubContext` to read-write."/>
+      <EntityType Name="Sensor" BaseType="Sensor.v1_3_6.Sensor"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Sensor.v1_4_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2021.2"/>
@@ -1070,6 +1178,12 @@
       <EntityType Name="Sensor" BaseType="Sensor.v1_4_4.Sensor"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Sensor.v1_4_6">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to change the permissions for `RelatedItem`, `PhysicalContext`, and `PhysicalSubContext` to read-write."/>
+      <EntityType Name="Sensor" BaseType="Sensor.v1_4_5.Sensor"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Sensor.v1_5_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2021.4"/>
@@ -1125,6 +1239,12 @@
       <EntityType Name="Sensor" BaseType="Sensor.v1_5_3.Sensor"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Sensor.v1_5_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to change the permissions for `RelatedItem`, `PhysicalContext`, and `PhysicalSubContext` to read-write."/>
+      <EntityType Name="Sensor" BaseType="Sensor.v1_5_4.Sensor"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Sensor.v1_6_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2022.2"/>
@@ -1157,6 +1277,12 @@
       <EntityType Name="Sensor" BaseType="Sensor.v1_6_3.Sensor"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Sensor.v1_6_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to change the permissions for `RelatedItem`, `PhysicalContext`, and `PhysicalSubContext` to read-write."/>
+      <EntityType Name="Sensor" BaseType="Sensor.v1_6_4.Sensor"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Sensor.v1_7_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2023.1"/>
@@ -1217,6 +1343,12 @@
       <EntityType Name="Sensor" BaseType="Sensor.v1_7_2.Sensor"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Sensor.v1_7_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to change the permissions for `RelatedItem`, `PhysicalContext`, and `PhysicalSubContext` to read-write."/>
+      <EntityType Name="Sensor" BaseType="Sensor.v1_7_3.Sensor"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Sensor.v1_8_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2023.2"/>
@@ -1249,6 +1381,12 @@
       <EntityType Name="Sensor" BaseType="Sensor.v1_8_2.Sensor"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Sensor.v1_8_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to change the permissions for `RelatedItem`, `PhysicalContext`, and `PhysicalSubContext` to read-write."/>
+      <EntityType Name="Sensor" BaseType="Sensor.v1_8_3.Sensor"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Sensor.v1_9_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2024.1"/>
@@ -1303,6 +1441,12 @@
       <EntityType Name="Sensor" BaseType="Sensor.v1_9_0.Sensor"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Sensor.v1_9_2">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to change the permissions for `RelatedItem`, `PhysicalContext`, and `PhysicalSubContext` to read-write."/>
+      <EntityType Name="Sensor" BaseType="Sensor.v1_9_1.Sensor"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Sensor.v1_10_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2024.2"/>
@@ -1322,5 +1466,19 @@
       <EntityType Name="Sensor" BaseType="Sensor.v1_10_0.Sensor"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Sensor.v1_10_2">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to change the permissions for `RelatedItem`, `PhysicalContext`, and `PhysicalSubContext` to read-write."/>
+      <EntityType Name="Sensor" BaseType="Sensor.v1_10_1.Sensor"/>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Sensor.v1_11_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2025.2"/>
+      <Annotation Term="OData.Description" String="This version was created to add `LinearPosition`, `LinearVelocity`, `LinearAcceleration`, `RotationalPosition`, `RotationalVelocity`, `RotationalAcceleration`, and `Valve` to `ReadingType`."/>
+
+      <EntityType Name="Sensor" BaseType="Sensor.v1_10_2.Sensor"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/SerialInterface_v1.xml b/redfish-core/schema/dmtf/csdl/SerialInterface_v1.xml
index 1aeb0ca..ec92d67 100644
--- a/redfish-core/schema/dmtf/csdl/SerialInterface_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/SerialInterface_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  SerialInterface v1.2.1                                              -->
+<!--# Redfish Schema:  SerialInterface v1.3.0                                              -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -19,6 +19,7 @@
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/RedfishExtensions_v1.xml">
     <edmx:Include Namespace="RedfishExtensions.v1_0_0" Alias="Redfish"/>
+    <edmx:Include Namespace="Validation.v1_0_0" Alias="Validation"/>
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Resource_v1.xml">
     <edmx:Include Namespace="Resource"/>
@@ -240,6 +241,42 @@
         <Member Name="Digi">
           <Annotation Term="OData.Description" String="The Digi pinout configuration."/>
         </Member>
+        <Member Name="Modbus2Wire">
+          <Annotation Term="OData.Description" String="The Modbus 2 wire pinout configuration."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the MODBUS over Serial Line Specification and Implementation guide-defined 2W-MODBUS pinout.  This value shall only be used if the `SignalType` property contains `Rs485`."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_3_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
+        <Member Name="Modbus4Wire">
+          <Annotation Term="OData.Description" String="The Modbus 4 wire pinout configuration."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the MODBUS over Serial Line Specification and Implementation guide-defined 4W-MODBUS pinout.  This value shall only be used if the `SignalType` property contains `Rs485`."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_3_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
+        <Member Name="ModbusRs232">
+          <Annotation Term="OData.Description" String="The Modbus RS232 pinout configuration."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the MODBUS over Serial Line Specification and Implementation guide-defined RS232-MODBUS pinout.  This value shall only be used if the `SignalType` property contains `Rs232`."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_3_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
       </EnumType>
 
       <TypeDefinition Name="ConnectorType" UnderlyingType="Edm.String">
@@ -457,5 +494,50 @@
       <EntityType Name="SerialInterface" BaseType="SerialInterface.v1_2_0.SerialInterface"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="SerialInterface.v1_3_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2025.2"/>
+      <Annotation Term="OData.Description" String="This version was created to add `Modbus2Wire`, `Modbus4Wire`, and `ModbusRs232` to `PinOut`."/>
+
+      <EntityType Name="SerialInterface" BaseType="SerialInterface.v1_2_1.SerialInterface">
+        <Property Name="Modbus" Type="SerialInterface.v1_3_0.Modbus" Nullable="false">
+          <Annotation Term="OData.Description" String="The Modbus settings for the serial interface."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the Modbus settings for this serial interface."/>
+        </Property>
+      </EntityType>
+
+      <ComplexType Name="Modbus">
+        <Annotation Term="OData.AdditionalProperties" Bool="false"/>
+        <Annotation Term="OData.Description" String="The Modbus settings for the serial interface."/>
+        <Annotation Term="OData.LongDescription" String="This type shall contain the Modbus settings for this serial interface."/>
+        <Property Name="Role" Type="SerialInterface.v1_3_0.Role" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="The role of the serial interface."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the role of this serial interface."/>
+        </Property>
+        <Property Name="ReadOnly" Type="Edm.Boolean">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="Indicates if the interface is read only."/>
+          <Annotation Term="OData.LongDescription" String="This property shall indicate if the serial interface is read only.  If `true`, the serial service on this manager shall reject or ignore requests that modify data.  This property shall only be present if the `Role` property contains `Server`."/>
+        </Property>
+        <Property Name="ServerId" Type="Edm.Int64">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="The server identifier for this Modbus RTU interface."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the MODBUS over Serial Line Specification and Implementation guide-defined address that identifies this Modbus RTU server.  This property shall only be present if the `Role` property contains `Server`."/>
+          <Annotation Term="Validation.Minimum" Int="1"/>
+          <Annotation Term="Validation.Maximum" Int="247"/>
+        </Property>
+      </ComplexType>
+
+      <EnumType Name="Role">
+        <Member Name="Client">
+          <Annotation Term="OData.Description" String="The serial interface is a client and connects to one or more servers across a serial bus."/>
+        </Member>
+        <Member Name="Server">
+          <Annotation Term="OData.Description" String="The serial interface is a server and allows one or more clients to connect across a serial bus."/>
+        </Member>
+      </EnumType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/ServiceRoot_v1.xml b/redfish-core/schema/dmtf/csdl/ServiceRoot_v1.xml
index 8ea8ed1..18df79f 100644
--- a/redfish-core/schema/dmtf/csdl/ServiceRoot_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/ServiceRoot_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  ServiceRoot v1.18.0                                                 -->
+<!--# Redfish Schema:  ServiceRoot v1.19.0                                                 -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -121,7 +121,9 @@
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/RegisteredClientCollection_v1.xml">
     <edmx:Include Namespace="RegisteredClientCollection"/>
   </edmx:Reference>
-
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/AutomationNodeCollection_v1.xml">
+    <edmx:Include Namespace="AutomationNodeCollection"/>
+  </edmx:Reference>
 
   <edmx:DataServices>
 
@@ -1287,5 +1289,23 @@
       </ComplexType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ServiceRoot.v1_19_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2025.2"/>
+
+      <EntityContainer Name="ServiceContainer" Extends="ServiceRoot.v1_16_0.ServiceContainer">
+        <Singleton Name="AutomationNodes" Type="AutomationNodeCollection.AutomationNodeCollection"/>
+      </EntityContainer>
+
+      <EntityType Name="ServiceRoot" BaseType="ServiceRoot.v1_18_0.ServiceRoot">
+        <NavigationProperty Name="AutomationNodes" Type="AutomationNodeCollection.AutomationNodeCollection" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The link to a collection of automation nodes."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource collection of type `AutomationNodeCollection`."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+      </EntityType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/SoftwareInventory_v1.xml b/redfish-core/schema/dmtf/csdl/SoftwareInventory_v1.xml
index 6c84b83..ef837c2 100644
--- a/redfish-core/schema/dmtf/csdl/SoftwareInventory_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/SoftwareInventory_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  SoftwareInventory v1.11.0                                           -->
+<!--# Redfish Schema:  SoftwareInventory v1.12.0                                           -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -72,6 +72,24 @@
         <Annotation Term="OData.Description" String="Additional versions."/>
         <Annotation Term="OData.LongDescription" String="This type shall contain additional versions."/>
       </ComplexType>
+
+      <Action Name="Activate" IsBound="true">
+        <Annotation Term="OData.Description" String="This action activates this software inventory instance."/>
+        <Annotation Term="OData.LongDescription" String="This action shall activate this software inventory instance."/>
+        <Parameter Name="SoftwareInventory" Type="SoftwareInventory.v1_0_0.Actions"/>
+        <Parameter Name="Targets" Type="Collection(Resource.Item)">
+          <Annotation Term="OData.Description" String="The target devices to activate this software image.  If not specified, the service activates this software image on all applicable devices."/>
+          <Annotation Term="OData.LongDescription" String="This parameter shall contain an array of target devices to activate this software image.  If not specified, the service shall activate this software image on all applicable devices."/>
+        </Parameter>
+        <Annotation Term="Redfish.Revisions">
+          <Collection>
+            <Record>
+              <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+              <PropertyValue Property="Version" String="v1_12_0"/>
+            </Record>
+          </Collection>
+        </Annotation>
+      </Action>
     </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="SoftwareInventory.v1_0_0">
@@ -548,5 +566,50 @@
       </ComplexType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="SoftwareInventory.v1_12_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2025.2"/>
+      <Annotation Term="OData.Description" String="This version was created to add the `Activate` action."/>
+
+      <EntityType Name="SoftwareInventory" BaseType="SoftwareInventory.v1_11_0.SoftwareInventory">
+        <Property Name="Active" Type="Edm.Boolean">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="This image is active on one or more devices."/>
+          <Annotation Term="OData.LongDescription" String="This property shall indicate that the software image is currently in use on one or more devices."/>
+        </Property>
+        <Property Name="Staged" Type="Edm.Boolean">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="This image is ready to be activated to one or more devices."/>
+          <Annotation Term="OData.LongDescription" String="This property shall indicate that the software image is ready to be activated to one or more devices."/>
+        </Property>
+        <Property Name="ResetRequiredOnUpdate" Type="Edm.Boolean">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="An indication of whether a reset is required to apply an update to this software."/>
+          <Annotation Term="OData.LongDescription" String="This property shall indicate whether a reset is required to apply an update to this software.  If `true`, a reset is required and clients should expect a disruption in communication to targets utilizing this software while applying an update.  If `false`, a reset is not required and communication can be maintained to targets utilizing this software throughout an update."/>
+        </Property>
+        <Property Name="Links" Type="SoftwareInventory.v1_12_0.Links" Nullable="false">
+          <Annotation Term="OData.Description" String="The links to other resources that are related to this resource."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain links to resources that are related to but are not contained by, or subordinate to, this resource."/>
+        </Property>
+      </EntityType>
+
+      <ComplexType Name="Links">
+        <Annotation Term="OData.Description" String="The links to other resources that are related to this resource."/>
+        <Annotation Term="OData.LongDescription" String="This property shall contain links to resources that are related to but are not contained by, or subordinate to, this resource."/>
+        <NavigationProperty Name="StagedTargets" Type="Collection(Resource.Item)">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="An array of devices where this software image is staged and ready to be activated."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an array of links to resources or objects that represent the devices where this software image is staged and ready to be activated."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+        <NavigationProperty Name="ActiveTargets" Type="Collection(Resource.Item)">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="An array of devices where this software image is currently running."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an array of links to resources or objects that represent the devices where this software image is currently running."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+      </ComplexType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/StorageControllerMetrics_v1.xml b/redfish-core/schema/dmtf/csdl/StorageControllerMetrics_v1.xml
index 0ab4190..db2804f 100644
--- a/redfish-core/schema/dmtf/csdl/StorageControllerMetrics_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/StorageControllerMetrics_v1.xml
@@ -57,12 +57,12 @@
         </Annotation>
         <Annotation Term="Redfish.Uris">
           <Collection>
-            <String>/redfish/v1/Storage/{StorageId}/Controllers/{ControllerId}/Metrics</String>
-            <String>/redfish/v1/Systems/{ComputerSystemId}/Storage/{StorageId}/Controllers/{ControllerId}/Metrics</String>
-            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/Controllers/{ControllerId}/Metrics</String>
-            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/Controllers/{ControllerId}/Metrics</String>
-            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/Controllers/{ControllerId}/Metrics</String>
-            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/Controllers/{ControllerId}/Metrics</String>
+            <String>/redfish/v1/Storage/{StorageId}/Controllers/{StorageControllerId}/Metrics</String>
+            <String>/redfish/v1/Systems/{ComputerSystemId}/Storage/{StorageId}/Controllers/{StorageControllerId}/Metrics</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/Controllers/{StorageControllerId}/Metrics</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/Controllers/{StorageControllerId}/Metrics</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/Controllers/{StorageControllerId}/Metrics</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/Controllers/{StorageControllerId}/Metrics</String>
           </Collection>
         </Annotation>
       </EntityType>
diff --git a/redfish-core/schema/dmtf/csdl/StorageController_v1.xml b/redfish-core/schema/dmtf/csdl/StorageController_v1.xml
index 7354187..e49874b 100644
--- a/redfish-core/schema/dmtf/csdl/StorageController_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/StorageController_v1.xml
@@ -97,12 +97,12 @@
         </Annotation>
         <Annotation Term="Redfish.Uris">
           <Collection>
-            <String>/redfish/v1/Storage/{StorageId}/Controllers/{ControllerId}</String>
-            <String>/redfish/v1/Systems/{ComputerSystemId}/Storage/{StorageId}/Controllers/{ControllerId}</String>
-            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/Controllers/{ControllerId}</String>
-            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/Controllers/{ControllerId}</String>
-            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/Controllers/{ControllerId}</String>
-            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/Controllers/{ControllerId}</String>
+            <String>/redfish/v1/Storage/{StorageId}/Controllers/{StorageControllerId}</String>
+            <String>/redfish/v1/Systems/{ComputerSystemId}/Storage/{StorageId}/Controllers/{StorageControllerId}</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/Controllers/{StorageControllerId}</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/Controllers/{StorageControllerId}</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/Controllers/{StorageControllerId}</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/Controllers/{StorageControllerId}</String>
           </Collection>
         </Annotation>
       </EntityType>
diff --git a/redfish-core/schema/dmtf/csdl/Storage_v1.xml b/redfish-core/schema/dmtf/csdl/Storage_v1.xml
index 827a76f..010c08e 100644
--- a/redfish-core/schema/dmtf/csdl/Storage_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/Storage_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################                   -->
-<!--# Redfish Schema:  Storage v1.18.0                                                                 -->
+<!--# Redfish Schema:  Storage v1.19.0                                                                 -->
 <!--#                                                                                                  -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,                  -->
 <!--# available at http://www.dmtf.org/standards/redfish                                               -->
@@ -234,6 +234,32 @@
           </Collection>
         </Annotation>
       </Action>
+
+      <Action Name="ImportForeignDrives" IsBound="true">
+        <Annotation Term="OData.Description" String="This action imports encrypted foreign drives to a host-based storage controller by supplying encryption access credentials."/>
+        <Annotation Term="OData.LongDescription" String="This action shall import encrypted foreign drives to a host-based storage controller by supplying encryption access credentials.  Upon successful completion, the `EncryptionStatus` property of the affected `Drive` shall change from `Foreign` to `Unlocked`."/>
+        <Parameter Name="Storage" Type="Storage.v1_0_0.Actions"/>
+        <Parameter Name="ControllerPassword" Type="Edm.String">
+          <Annotation Term="OData.Description" String="The current controller password.  This parameter is not required if the controller does not currently have a password."/>
+          <Annotation Term="OData.LongDescription" String="This parameter shall contain the current controller password.  Services may reject the action request if this parameter is not provided or the value supplied does not match the current password."/>
+        </Parameter>
+        <Parameter Name="DriveEncryptionKey" Type="Edm.String" Nullable="false">
+          <Annotation Term="OData.Description" String="The encryption key to unlock the drives."/>
+          <Annotation Term="OData.LongDescription" String="This parameter shall contain the encryption key to unlock the drives."/>
+        </Parameter>
+        <Parameter Name="DriveEncryptionKeyIdentifier" Type="Edm.String">
+          <Annotation Term="OData.Description" String="An encryption key identifier to filter the drives that are imported.  If not provided, the controller attempts to import all foreign drives."/>
+          <Annotation Term="OData.LongDescription" String="This parameter shall contain an encryption key identifier to filter the drives that are imported.  If this parameter is not provided, the service shall not perform filtering of foreign drives."/>
+        </Parameter>
+        <Annotation Term="Redfish.Revisions">
+          <Collection>
+            <Record>
+              <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+              <PropertyValue Property="Version" String="v1_19_0"/>
+            </Record>
+          </Collection>
+        </Annotation>
+      </Action>
     </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Storage.v1_0_0">
@@ -1852,5 +1878,13 @@
       </ComplexType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Storage.v1_19_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2025.2"/>
+      <Annotation Term="OData.Description" String="This version was created to add the `ImportForeignDrive` action."/>
+
+      <EntityType Name="Storage" BaseType="Storage.v1_18_0.Storage"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/Switch_v1.xml b/redfish-core/schema/dmtf/csdl/Switch_v1.xml
index 3d34df3..a5a616d 100644
--- a/redfish-core/schema/dmtf/csdl/Switch_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/Switch_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  Switch v1.9.3                                                       -->
+<!--# Redfish Schema:  Switch v1.10.0                                                      -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -39,6 +39,9 @@
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/PortCollection_v1.xml">
     <edmx:Include Namespace="PortCollection"/>
   </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/VirtualCXLSwitchCollection_v1.xml">
+    <edmx:Include Namespace="VirtualCXLSwitchCollection"/>
+  </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/LogServiceCollection_v1.xml">
     <edmx:Include Namespace="LogServiceCollection"/>
   </edmx:Reference>
@@ -693,6 +696,15 @@
         <Property Name="VCS" Type="Switch.v1_9_0.VCSSwitch" Nullable="false">
           <Annotation Term="OData.Description" String="Virtual CXL Switch (VCS) properties for this switch."/>
           <Annotation Term="OData.LongDescription" String="This property shall contain Virtual CXL Switch (VCS) properties for this switch."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Deprecated"/>
+                <PropertyValue Property="Version" String="v1_9_0"/>
+                <PropertyValue Property="Description" String="This property has been deprecated in favor of `VirtualCXLSwitches` in `CXL`."/>
+              </Record>
+            </Collection>
+          </Annotation>
         </Property>
       </ComplexType>
 
@@ -725,5 +737,36 @@
       <EntityType Name="Switch" BaseType="Switch.v1_9_2.Switch"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Switch.v1_10_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2025.2"/>
+
+      <EntityType Name="Switch" BaseType="Switch.v1_9_3.Switch"/>
+
+      <ComplexType Name="CXL" BaseType="Switch.v1_9_0.CXL">
+        <Property Name="TotalHDMDecoders" Type="Edm.Int64" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The total number of HDM (Host Device Memory) decoders available per upstream port."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the total number of HDM (Host Device Memory) decoders available per upstream port."/>
+        </Property>
+        <Property Name="NumberOfBoundvPPBs" Type="Edm.Int64" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The total number of vPPBs (Virtual PCI-to-PCI Bridges) that are currently bound on this switch."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the total number of vPPBs (Virtual PCI-to-PCI Bridges) that are currently bound on this switch."/>
+        </Property>
+        <Property Name="PBRCapable" Type="Edm.Boolean" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="An indication of whether the switch is capable of performing port-based routing."/>
+          <Annotation Term="OData.LongDescription" String="This property shall indicate whether the switch is capable of performing port-based routing."/>
+        </Property>
+        <NavigationProperty Name="VirtualCXLSwitches" Type="VirtualCXLSwitchCollection.VirtualCXLSwitchCollection" ContainsTarget="true" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The link to the collection of Virtual CXL Switches (VCS) for this CXL switch."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource collection of type `VirtualCXLSwitchCollection`."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+      </ComplexType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/TelemetryDataCollection_v1.xml b/redfish-core/schema/dmtf/csdl/TelemetryDataCollection_v1.xml
new file mode 100644
index 0000000..7da53b8
--- /dev/null
+++ b/redfish-core/schema/dmtf/csdl/TelemetryDataCollection_v1.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!---->
+<!--################################################################################       -->
+<!--# Redfish Schema:  TelemetryDataCollection                                             -->
+<!--#                                                                                      -->
+<!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
+<!--# available at http://www.dmtf.org/standards/redfish                                   -->
+<!--# Copyright 2014-2025 DMTF.                                                            -->
+<!--# For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright -->
+<!--################################################################################       -->
+<!---->
+<edmx:Edmx xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx" Version="4.0">
+
+  <edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Core.V1.xml">
+    <edmx:Include Namespace="Org.OData.Core.V1" Alias="OData"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Capabilities.V1.xml">
+    <edmx:Include Namespace="Org.OData.Capabilities.V1" Alias="Capabilities"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Resource_v1.xml">
+    <edmx:Include Namespace="Resource.v1_0_0"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/RedfishExtensions_v1.xml">
+    <edmx:Include Namespace="RedfishExtensions.v1_0_0" Alias="Redfish"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/TelemetryData_v1.xml">
+    <edmx:Include Namespace="TelemetryData"/>
+  </edmx:Reference>
+
+  <edmx:DataServices>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="TelemetryDataCollection">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Language" String="en"/>
+
+      <EntityType Name="TelemetryDataCollection" BaseType="Resource.v1_0_0.ResourceCollection">
+        <Annotation Term="OData.Description" String="The collection of `TelemetryData` resource instances."/>
+        <Annotation Term="OData.LongDescription" String="This resource shall represent a resource collection of `TelemetryData` instances for a Redfish implementation."/>
+        <Annotation Term="Capabilities.InsertRestrictions">
+          <Record>
+            <PropertyValue Property="Insertable" Bool="false"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Capabilities.UpdateRestrictions">
+          <Record>
+            <PropertyValue Property="Updatable" Bool="false"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Capabilities.DeleteRestrictions">
+          <Record>
+            <PropertyValue Property="Deletable" Bool="false"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Redfish.Uris">
+          <Collection>
+            <String>/redfish/v1/TelemetryService/TelemetryData</String>
+          </Collection>
+        </Annotation>
+        <NavigationProperty Name="Members" Type="Collection(TelemetryData.TelemetryData)">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The members of this collection."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an array of links to the members of this collection."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+          <Annotation Term="Redfish.Required"/>
+        </NavigationProperty>
+      </EntityType>
+    </Schema>
+
+  </edmx:DataServices>
+</edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/TelemetryData_v1.xml b/redfish-core/schema/dmtf/csdl/TelemetryData_v1.xml
new file mode 100644
index 0000000..dd1cc4e
--- /dev/null
+++ b/redfish-core/schema/dmtf/csdl/TelemetryData_v1.xml
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!---->
+<!--################################################################################       -->
+<!--# Redfish Schema:  TelemetryData v1.0.0                                                -->
+<!--#                                                                                      -->
+<!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
+<!--# available at http://www.dmtf.org/standards/redfish                                   -->
+<!--# Copyright 2014-2025 DMTF.                                                            -->
+<!--# For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright -->
+<!--################################################################################       -->
+<!---->
+<edmx:Edmx xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx" Version="4.0">
+
+  <edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Core.V1.xml">
+    <edmx:Include Namespace="Org.OData.Core.V1" Alias="OData"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Capabilities.V1.xml">
+    <edmx:Include Namespace="Org.OData.Capabilities.V1" Alias="Capabilities"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Resource_v1.xml">
+    <edmx:Include Namespace="Resource"/>
+    <edmx:Include Namespace="Resource.v1_0_0"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/RedfishExtensions_v1.xml">
+    <edmx:Include Namespace="RedfishExtensions.v1_0_0" Alias="Redfish"/>
+  </edmx:Reference>
+
+  <edmx:DataServices>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="TelemetryData">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Language" String="en"/>
+
+      <EntityType Name="TelemetryData" BaseType="Resource.v1_0_0.Resource" Abstract="true">
+        <Annotation Term="OData.Description" String="The `TelemetryData` schema represents bulk telemetry data from a device or service."/>
+        <Annotation Term="OData.LongDescription" String="This resource shall represent bulk telemetry data in a Redfish implementation."/>
+        <Annotation Term="Capabilities.InsertRestrictions">
+          <Record>
+            <PropertyValue Property="Insertable" Bool="false"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Capabilities.UpdateRestrictions">
+          <Record>
+            <PropertyValue Property="Updatable" Bool="false"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Capabilities.DeleteRestrictions">
+          <Record>
+            <PropertyValue Property="Deletable" Bool="true"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Redfish.Uris">
+          <Collection>
+            <String>/redfish/v1/TelemetryService/TelemetryData/{TelemetryDataId}</String>
+          </Collection>
+        </Annotation>
+      </EntityType>
+
+      <EnumType Name="TelemetryDataTypes">
+        <Member Name="OEM">
+          <Annotation Term="OData.Description" String="OEM telemetry data."/>
+        </Member>
+      </EnumType>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="TelemetryData.v1_0_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2025.2"/>
+
+      <EntityType Name="TelemetryData" BaseType="TelemetryData.TelemetryData">
+        <Property Name="Timestamp" Type="Edm.DateTimeOffset">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The date and time when the telemetry data was generated."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the time when the telemetry data was generated."/>
+        </Property>
+        <Property Name="TelemetryDataType" Type="TelemetryData.TelemetryDataTypes">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The type of telemetry data available in the `AdditionalData` property or retrieved from the URI specified by the `AdditionalDataURI` property."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the type of telemetry data available in the `AdditionalData` property or retrieved from the URI specified by the `AdditionalDataURI` property."/>
+        </Property>
+        <Property Name="OEMTelemetryDataType" Type="Edm.String">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The OEM-defined type of telemetry data available in the `AdditionalData` property or retrieved from the URI specified by the `AdditionalDataURI` property."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the OEM-defined type of telemetry data available in the `AdditionalData` property or retrieved from the URI specified by the `AdditionalDataURI` property.  The value of this property should begin with the organization identifier.  This property shall be present if `TelemetryDataType` is `OEM`."/>
+        </Property>
+        <Property Name="AdditionalData" Type="Edm.String" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="A Base64-encoded string of the associated telemetry data."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a Base64-encoded string, with padding characters, of the associated telemetry data.  The contents shall depend on the value of the `TelemetryDataType` property.  The length of the value should not exceed 4 KB.  Larger telemetry data payloads should omit this property and use the `AdditionalDataURI` property to reference the data.  If both `AdditionalData` and `AdditionalDataURI` are present, `AdditionalData` shall contain the Base64-encoding of the data retrieved from the URI specified by the `AdditionalDataURI` property."/>
+        </Property>
+        <Property Name="AdditionalDataURI" Type="Edm.String" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The URI at which to access the associated telemetry data."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the URI at which to access the associated telemetry data, using the Redfish protocol and authentication methods.  If both `AdditionalData` and `AdditionalDataURI` are present, `AdditionalData` shall contain a Base64-encoded string, with padding characters, of the data retrieved from the URI specified by the `AdditionalDataURI` property."/>
+          <Annotation Term="OData.IsURL"/>
+        </Property>
+        <Property Name="AdditionalDataSizeBytes" Type="Edm.Int64">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The size of the data available at location specified by `AdditionalDataURI`."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the size of the data available at location specified by `AdditionalDataURI`:."/>
+        </Property>
+        <Property Name="Actions" Type="TelemetryData.v1_0_0.Actions" Nullable="false">
+          <Annotation Term="OData.Description" String="The available actions for this resource."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the available actions for this resource."/>
+        </Property>
+      </EntityType>
+
+      <ComplexType Name="Actions">
+        <Annotation Term="OData.AdditionalProperties" Bool="false"/>
+        <Annotation Term="OData.Description" String="The available actions for this resource."/>
+        <Annotation Term="OData.LongDescription" String="This type shall contain the available actions for this resource."/>
+        <Property Name="Oem" Type="TelemetryData.v1_0_0.OemActions" Nullable="false">
+          <Annotation Term="OData.Description" String="The available OEM-specific actions for this resource."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the available OEM-specific actions for this resource."/>
+        </Property>
+      </ComplexType>
+
+      <ComplexType Name="OemActions">
+        <Annotation Term="OData.AdditionalProperties" Bool="true"/>
+        <Annotation Term="OData.Description" String="The available OEM-specific actions for this resource."/>
+        <Annotation Term="OData.LongDescription" String="This type shall contain the available OEM-specific actions for this resource."/>
+      </ComplexType>
+    </Schema>
+
+  </edmx:DataServices>
+</edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/TelemetryService_v1.xml b/redfish-core/schema/dmtf/csdl/TelemetryService_v1.xml
index bb2717d..35c816a 100644
--- a/redfish-core/schema/dmtf/csdl/TelemetryService_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/TelemetryService_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  TelemetryService v1.3.4                                             -->
+<!--# Redfish Schema:  TelemetryService v1.4.0                                             -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -42,6 +42,12 @@
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/MetricDefinition_v1.xml">
     <edmx:Include Namespace="MetricDefinition"/>
   </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/TelemetryDataCollection_v1.xml">
+    <edmx:Include Namespace="TelemetryDataCollection"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/TelemetryData_v1.xml">
+    <edmx:Include Namespace="TelemetryData"/>
+  </edmx:Reference>
 
   <edmx:DataServices>
 
@@ -151,6 +157,47 @@
           </Collection>
         </Annotation>
       </Action>
+
+      <Action Name="CollectTelemetryData" IsBound="true">
+        <Annotation Term="OData.Description" String="The action to collect the telemetry data from a device or service.  When the telemetry data is collected, a new telemetry data resource will be created."/>
+        <Annotation Term="OData.LongDescription" String="This action shall collect the telemetry data from a device or service.  The `Location` header in the response shall contain a URI to a resource of type `TelemetryData` that contains the telemetry data.  The `AdditionalDataURI` property in the referenced `TelemetryData` resource shall contain the URI to download the telemetry data."/>
+        <Parameter Name="TelemetryService" Type="TelemetryService.v1_0_0.Actions"/>
+        <Parameter Name="TelemetryDataType" Type="TelemetryData.TelemetryDataTypes" Nullable="false">
+          <Annotation Term="OData.Description" String="The type of telemetry data to collect."/>
+          <Annotation Term="OData.LongDescription" String="This parameter shall contain the type of telemetry data to collect."/>
+        </Parameter>
+        <Parameter Name="OEMTelemetryDataType" Type="Edm.String">
+          <Annotation Term="OData.Description" String="The OEM-defined type of telemetry data to collect."/>
+          <Annotation Term="OData.LongDescription" String="This parameter shall contain the OEM-defined type of telemetry data to collect.  This parameter shall be required if `TelemetryDataType` is `OEM`."/>
+        </Parameter>
+        <Parameter Name="TargetDevices" Type="Collection(Resource.Item)">
+          <Annotation Term="OData.Description" String="An array of devices from which to collect telemetry data."/>
+          <Annotation Term="OData.LongDescription" String="This parameter shall contain an array of devices from which to collect telemetry data."/>
+        </Parameter>
+        <ReturnType Type="TelemetryService.v1_4_0.CollectTelemetryDataResponse" Nullable="false"/>
+        <Annotation Term="Redfish.Revisions">
+          <Collection>
+            <Record>
+              <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+              <PropertyValue Property="Version" String="v1_4_0"/>
+            </Record>
+          </Collection>
+        </Annotation>
+      </Action>
+
+      <Action Name="ClearTelemetryData" IsBound="true">
+        <Annotation Term="OData.Description" String="The action to clear the telemetry data for this telemetry service."/>
+        <Annotation Term="OData.LongDescription" String="This action shall delete all entries found in the telemetry data collection for this telemetry service."/>
+        <Parameter Name="TelemetryService" Type="TelemetryService.v1_0_0.Actions"/>
+        <Annotation Term="Redfish.Revisions">
+          <Collection>
+            <Record>
+              <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+              <PropertyValue Property="Version" String="v1_4_0"/>
+            </Record>
+          </Collection>
+        </Annotation>
+      </Action>
     </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="TelemetryService.v1_0_0">
@@ -466,5 +513,42 @@
       <EntityType Name="TelemetryService" BaseType="TelemetryService.v1_3_3.TelemetryService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="TelemetryService.v1_4_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2025.2"/>
+      <Annotation Term="OData.Description" String="This version was created to add the `CollectTelemetryData` action."/>
+
+      <EntityType Name="TelemetryService" BaseType="TelemetryService.v1_3_4.TelemetryService">
+        <Property Name="SupportedTelemetryDataTypes" Type="Collection(TelemetryData.TelemetryDataTypes)">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="A list of supported telemetry data types."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a list of supported telemetry data types."/>
+        </Property>
+        <Property Name="SupportedOEMTelemetryDataTypes" Type="Collection(Edm.String)">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="A list of supported OEM-defined telemetry data types."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a list of supported OEM-defined telemetry data types."/>
+        </Property>
+        <NavigationProperty Name="TelemetryData" Type="TelemetryDataCollection.TelemetryDataCollection" ContainsTarget="true" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The link to the collection of data telemetry."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource collection of type `TelemetryDataCollection`."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+      </EntityType>
+
+      <ComplexType Name="CollectTelemetryDataResponse">
+        <Annotation Term="OData.AdditionalProperties" Bool="false"/>
+        <Annotation Term="OData.Description" String="The response body for the `CollectTelemetryData` action."/>
+        <Annotation Term="OData.LongDescription" String="This type shall contain the properties found in the response body for the `CollectTelemetryData` action."/>
+        <Property Name="TelmetryData" Type="Collection(Edm.String)" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="An array of links to the collected telemetry data."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an array of links to resources of type `TelemetryData` that represent the collected telemetry data."/>
+          <Annotation Term="Redfish.Required"/>
+        </Property>
+      </ComplexType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/ThermalEquipment_v1.xml b/redfish-core/schema/dmtf/csdl/ThermalEquipment_v1.xml
index 966c827..85c6cb9 100644
--- a/redfish-core/schema/dmtf/csdl/ThermalEquipment_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/ThermalEquipment_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  ThermalEquipment v1.1.2                                             -->
+<!--# Redfish Schema:  ThermalEquipment v1.2.0                                             -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -159,5 +159,19 @@
       <EntityType Name="ThermalEquipment" BaseType="ThermalEquipment.v1_1_1.ThermalEquipment"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ThermalEquipment.v1_2_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2025.2"/>
+
+      <EntityType Name="ThermalEquipment" BaseType="ThermalEquipment.v1_1_2.ThermalEquipment">
+        <NavigationProperty Name="RPUs" Type="CoolingUnitCollection.CoolingUnitCollection" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="A link to a collection of reservoir and pumping units (RPUs)."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource collection of type `CoolingUnitCollection` that contains a set of reservoir and pumping units."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+      </EntityType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/ThermalSubsystem_v1.xml b/redfish-core/schema/dmtf/csdl/ThermalSubsystem_v1.xml
index f5ba99b..3ffd5a52 100644
--- a/redfish-core/schema/dmtf/csdl/ThermalSubsystem_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/ThermalSubsystem_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  ThermalSubsystem v1.3.3                                             -->
+<!--# Redfish Schema:  ThermalSubsystem v1.4.0                                             -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -46,6 +46,9 @@
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/LeakDetection_v1.xml">
     <edmx:Include Namespace="LeakDetection"/>
   </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/FilterCollection_v1.xml">
+    <edmx:Include Namespace="FilterCollection"/>
+  </edmx:Reference>
 
   <edmx:DataServices>
 
@@ -210,7 +213,7 @@
         <NavigationProperty Name="LeakDetection" Type="LeakDetection.LeakDetection" ContainsTarget="true" Nullable="false">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The link to the leak detection system within this chassis."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource of type `LeakDetection`.  This link should be used when the leak detection capabilities are tied to, or are internal to, a particular `Chassis`.  For detection capabilties that are tied to a `CoolingUnit` resource, which may span multiple `Chassis` resources, populating the `LeakDetection` resource under `CoolingUnit` for the relevant equipment is the preferred approach."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource of type `LeakDetection`.  This link should be used when the leak detection capabilities are tied to, or are internal to, a particular `Chassis`.  For detection capabilities that are tied to a `CoolingUnit` resource, which may span multiple `Chassis` resources, populating the `LeakDetection` resource under `CoolingUnit` for the relevant equipment is the preferred approach."/>
           <Annotation Term="OData.AutoExpandReferences"/>
         </NavigationProperty>
       </EntityType>
@@ -234,5 +237,19 @@
       <EntityType Name="ThermalSubsystem" BaseType="ThermalSubsystem.v1_3_2.ThermalSubsystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ThermalSubsystem.v1_4_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2025.2"/>
+
+      <EntityType Name="ThermalSubsystem" BaseType="ThermalSubsystem.v1_3_3.ThermalSubsystem">
+        <NavigationProperty Name="Filters" Type="FilterCollection.FilterCollection" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="A link to the filters for this equipment."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource collection of type `FilterCollection` that contains the filters for this equipment."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+      </EntityType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/TrustedComponent_v1.xml b/redfish-core/schema/dmtf/csdl/TrustedComponent_v1.xml
index 1eded35..65a2f5e 100644
--- a/redfish-core/schema/dmtf/csdl/TrustedComponent_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/TrustedComponent_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  TrustedComponent v1.3.2                                             -->
+<!--# Redfish Schema:  TrustedComponent v1.4.0                                             -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -327,5 +327,17 @@
       <EntityType Name="TrustedComponent" BaseType="TrustedComponent.v1_3_1.TrustedComponent"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="TrustedComponent.v1_4_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2025.2"/>
+
+      <EntityType Name="TrustedComponent" BaseType="TrustedComponent.v1_3_2.TrustedComponent">
+        <Property Name="Location" Type="Resource.Location" Nullable="false">
+          <Annotation Term="OData.Description" String="The location of the trusted component."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the location information of the trusted component."/>
+        </Property>
+      </EntityType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/USBController_v1.xml b/redfish-core/schema/dmtf/csdl/USBController_v1.xml
index 6bbf6c5..3e07880 100644
--- a/redfish-core/schema/dmtf/csdl/USBController_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/USBController_v1.xml
@@ -62,7 +62,7 @@
         </Annotation>
         <Annotation Term="Redfish.Uris">
           <Collection>
-            <String>/redfish/v1/Systems/{ComputerSystemId}/USBControllers/{ControllerId}</String>
+            <String>/redfish/v1/Systems/{ComputerSystemId}/USBControllers/{USBControllerId}</String>
           </Collection>
         </Annotation>
       </EntityType>
diff --git a/redfish-core/schema/dmtf/csdl/UpdateServiceCapabilities_v1.xml b/redfish-core/schema/dmtf/csdl/UpdateServiceCapabilities_v1.xml
new file mode 100644
index 0000000..16b9041
--- /dev/null
+++ b/redfish-core/schema/dmtf/csdl/UpdateServiceCapabilities_v1.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!---->
+<!--################################################################################       -->
+<!--# Redfish Schema:  UpdateServiceCapabilities v1.0.0                                    -->
+<!--#                                                                                      -->
+<!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
+<!--# available at http://www.dmtf.org/standards/redfish                                   -->
+<!--# Copyright 2014-2025 DMTF.                                                            -->
+<!--# For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright -->
+<!--################################################################################       -->
+<!---->
+<edmx:Edmx xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx" Version="4.0">
+
+  <edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Core.V1.xml">
+    <edmx:Include Namespace="Org.OData.Core.V1" Alias="OData"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Capabilities.V1.xml">
+    <edmx:Include Namespace="Org.OData.Capabilities.V1" Alias="Capabilities"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/RedfishExtensions_v1.xml">
+    <edmx:Include Namespace="RedfishExtensions.v1_0_0" Alias="Redfish"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Resource_v1.xml">
+    <edmx:Include Namespace="Resource"/>
+    <edmx:Include Namespace="Resource.v1_0_0"/>
+  </edmx:Reference>
+
+  <edmx:DataServices>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="UpdateServiceCapabilities">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Language" String="en"/>
+
+      <EntityType Name="UpdateServiceCapabilities" BaseType="Resource.v1_0_0.Resource" Abstract="true">
+        <Annotation Term="OData.Description" String="The `UpdateServiceCapabilities` schema contains capabilities of the update service."/>
+        <Annotation Term="OData.LongDescription" String="This resource shall represent the update service capabilities for a Redfish implementation."/>
+        <Annotation Term="Capabilities.InsertRestrictions">
+          <Record>
+            <PropertyValue Property="Insertable" Bool="false"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Capabilities.UpdateRestrictions">
+          <Record>
+            <PropertyValue Property="Updatable" Bool="false"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Capabilities.DeleteRestrictions">
+          <Record>
+            <PropertyValue Property="Deletable" Bool="false"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Redfish.Uris">
+          <Collection>
+            <String>/redfish/v1/UpdateService/UpdateServiceCapabilities</String>
+          </Collection>
+        </Annotation>
+      </EntityType>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="UpdateServiceCapabilities.v1_0_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2025.2"/>
+
+      <EntityType Name="UpdateServiceCapabilities" BaseType="UpdateServiceCapabilities.UpdateServiceCapabilities">
+        <Property Name="AllowableTargets" Type="Collection(Edm.String)" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The allowable URIs that a client can specify in the `Targets` parameter for update requests."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an array of the allowable URIs that a client can specify in the `Targets` parameter for `SimpleUpdate` or `MultipartHttpPushUri` update requests."/>
+        </Property>
+        <Property Name="AllowableStaging" Type="Collection(Edm.String)" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The allowable URIs that a client can specify in the `Targets` parameter for update requests when requesting to stage an image on target devices."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an array of the allowable URIs that a client can specify in the `Targets` parameter for `SimpleUpdate` or `MultipartHttpPushUri` update requests with `Stage` set to `true`."/>
+        </Property>
+        <Property Name="Actions" Type="UpdateServiceCapabilities.v1_0_0.Actions" Nullable="false">
+          <Annotation Term="OData.Description" String="The available actions for this resource."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the available actions for this resource."/>
+        </Property>
+      </EntityType>
+
+      <ComplexType Name="Actions">
+        <Annotation Term="OData.AdditionalProperties" Bool="false"/>
+        <Annotation Term="OData.Description" String="The available actions for this resource."/>
+        <Annotation Term="OData.LongDescription" String="This type shall contain the available actions for this resource."/>
+        <Property Name="Oem" Type="UpdateServiceCapabilities.v1_0_0.OemActions" Nullable="false">
+          <Annotation Term="OData.Description" String="The available OEM-specific actions for this resource."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the available OEM-specific actions for this resource."/>
+        </Property>
+      </ComplexType>
+
+      <ComplexType Name="OemActions">
+        <Annotation Term="OData.AdditionalProperties" Bool="true"/>
+        <Annotation Term="OData.Description" String="The available OEM-specific actions for this resource."/>
+        <Annotation Term="OData.LongDescription" String="This type shall contain the available OEM-specific actions for this resource."/>
+      </ComplexType>
+    </Schema>
+
+  </edmx:DataServices>
+</edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/UpdateService_v1.xml b/redfish-core/schema/dmtf/csdl/UpdateService_v1.xml
index 84b21e0..67bd8e3 100644
--- a/redfish-core/schema/dmtf/csdl/UpdateService_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/UpdateService_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  UpdateService v1.15.0                                               -->
+<!--# Redfish Schema:  UpdateService v1.16.0                                               -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -40,6 +40,12 @@
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Key_v1.xml">
     <edmx:Include Namespace="Key"/>
   </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/UpdateServiceCapabilities_v1.xml">
+    <edmx:Include Namespace="UpdateServiceCapabilities"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/SoftwareInventory_v1.xml">
+    <edmx:Include Namespace="SoftwareInventory"/>
+  </edmx:Reference>
 
   <edmx:DataServices>
 
@@ -137,6 +143,18 @@
             </Collection>
           </Annotation>
         </Parameter>
+        <Parameter Name="Stage" Type="Edm.Boolean">
+          <Annotation Term="OData.Description" String="An indication of whether the service stages the image on target devices for a client to activate at a later time."/>
+          <Annotation Term="OData.LongDescription" String="This parameter shall indicate whether the service stages the image on target devices for a client to activate at a later time with the `Activate` action on the `SoftwareInventory` resource.  If the client does not provide this parameter, the service shall default this value to `false`."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_16_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Parameter>
       </Action>
 
       <Action Name="StartUpdate" IsBound="true">
@@ -192,6 +210,24 @@
           </Collection>
         </Annotation>
       </Action>
+
+      <Action Name="Activate" IsBound="true">
+        <Annotation Term="OData.Description" String="This action activates specified software inventory instance."/>
+        <Annotation Term="OData.LongDescription" String="This action shall activate specified software inventory instance."/>
+        <Parameter Name="UpdateService" Type="UpdateService.v1_0_0.Actions"/>
+        <Parameter Name="Targets" Type="Collection(SoftwareInventory.SoftwareInventory)" Nullable="false">
+          <Annotation Term="OData.Description" String="The target software inventory instances to activate on staged devices."/>
+          <Annotation Term="OData.LongDescription" String="This parameter shall contain an array of target software inventory instances to activate on staged devices.  The service shall activate each software image on all applicable devices."/>
+        </Parameter>
+        <Annotation Term="Redfish.Revisions">
+          <Collection>
+            <Record>
+              <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+              <PropertyValue Property="Version" String="v1_16_0"/>
+            </Record>
+          </Collection>
+        </Annotation>
+      </Action>
     </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="UpdateService.v1_0_0">
@@ -1460,5 +1496,28 @@
       <EntityType Name="UpdateService" BaseType="UpdateService.v1_14_1.UpdateService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="UpdateService.v1_16_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2025.2"/>
+      <Annotation Term="OData.Description" String="This version was created to add the `Activate` action."/>
+
+      <EntityType Name="UpdateService" BaseType="UpdateService.v1_15_0.UpdateService">
+        <NavigationProperty Name="UpdateServiceCapabilities" Type="UpdateServiceCapabilities.UpdateServiceCapabilities" ContainsTarget="true" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="A link to the capabilities of the update service."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource of type `UpdateServiceCapabilities` that contains the capabilities of the update service."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+      </EntityType>
+
+      <ComplexType Name="UpdateParameters" BaseType="UpdateService.v1_11_0.UpdateParameters">
+        <Property Name="Stage" Type="Edm.Boolean" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="An indication of whether the service stages the image on target devices for a client to activate at a later time."/>
+          <Annotation Term="OData.LongDescription" String="This property shall indicate whether the service stages the image on target devices for a client to activate at a later time with the `Activate` action on the `SoftwareInventory` resource.  If the client does not provide this parameter, the service shall default this value to `false`."/>
+        </Property>
+      </ComplexType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/VirtualCXLSwitchCollection_v1.xml b/redfish-core/schema/dmtf/csdl/VirtualCXLSwitchCollection_v1.xml
new file mode 100644
index 0000000..e774dc3
--- /dev/null
+++ b/redfish-core/schema/dmtf/csdl/VirtualCXLSwitchCollection_v1.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!---->
+<!--################################################################################       -->
+<!--# Redfish Schema:  VirtualCXLSwitchCollection                                          -->
+<!--#                                                                                      -->
+<!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
+<!--# available at http://www.dmtf.org/standards/redfish                                   -->
+<!--# Copyright 2014-2025 DMTF.                                                            -->
+<!--# For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright -->
+<!--################################################################################       -->
+<!---->
+<edmx:Edmx xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx" Version="4.0">
+
+  <edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Core.V1.xml">
+    <edmx:Include Namespace="Org.OData.Core.V1" Alias="OData"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Capabilities.V1.xml">
+    <edmx:Include Namespace="Org.OData.Capabilities.V1" Alias="Capabilities"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Resource_v1.xml">
+    <edmx:Include Namespace="Resource.v1_0_0"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/RedfishExtensions_v1.xml">
+    <edmx:Include Namespace="RedfishExtensions.v1_0_0" Alias="Redfish"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/VirtualCXLSwitch_v1.xml">
+    <edmx:Include Namespace="VirtualCXLSwitch"/>
+  </edmx:Reference>
+
+  <edmx:DataServices>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="VirtualCXLSwitchCollection">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+
+      <EntityType Name="VirtualCXLSwitchCollection" BaseType="Resource.v1_0_0.ResourceCollection">
+        <Annotation Term="OData.Description" String="The collection of `VirtualCXLSwitch` resource instances."/>
+        <Annotation Term="OData.LongDescription" String="This resource shall represent a resource collection of `VirtualCXLSwitch` instances for a Redfish implementation."/>
+        <Annotation Term="Capabilities.InsertRestrictions">
+          <Record>
+            <PropertyValue Property="Insertable" Bool="false"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Capabilities.UpdateRestrictions">
+          <Record>
+            <PropertyValue Property="Updatable" Bool="false"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Capabilities.DeleteRestrictions">
+          <Record>
+            <PropertyValue Property="Deletable" Bool="false"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Redfish.Uris">
+          <Collection>
+            <String>/redfish/v1/Fabrics/{FabricId}/Switches/{SwitchId}/VCSs</String>
+          </Collection>
+        </Annotation>
+        <NavigationProperty Name="Members" Type="Collection(VirtualCXLSwitch.VirtualCXLSwitch)">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The members of this collection."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an array of links to the members of this collection."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+          <Annotation Term="Redfish.Required"/>
+        </NavigationProperty>
+      </EntityType>
+    </Schema>
+
+  </edmx:DataServices>
+</edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/VirtualCXLSwitch_v1.xml b/redfish-core/schema/dmtf/csdl/VirtualCXLSwitch_v1.xml
new file mode 100644
index 0000000..0ea442a
--- /dev/null
+++ b/redfish-core/schema/dmtf/csdl/VirtualCXLSwitch_v1.xml
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!---->
+<!--################################################################################       -->
+<!--# Redfish Schema:  VirtualCXLSwitch v1.0.0                                             -->
+<!--#                                                                                      -->
+<!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
+<!--# available at http://www.dmtf.org/standards/redfish                                   -->
+<!--# Copyright 2014-2025 DMTF.                                                            -->
+<!--# For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright -->
+<!--################################################################################       -->
+<!---->
+<edmx:Edmx xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx" Version="4.0">
+
+  <edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Core.V1.xml">
+    <edmx:Include Namespace="Org.OData.Core.V1" Alias="OData"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Capabilities.V1.xml">
+    <edmx:Include Namespace="Org.OData.Capabilities.V1" Alias="Capabilities"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Resource_v1.xml">
+    <edmx:Include Namespace="Resource"/>
+    <edmx:Include Namespace="Resource.v1_0_0"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/RedfishExtensions_v1.xml">
+    <edmx:Include Namespace="RedfishExtensions.v1_0_0" Alias="Redfish"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/VirtualPCI2PCIBridgeCollection_v1.xml">
+    <edmx:Include Namespace="VirtualPCI2PCIBridgeCollection"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Endpoint_v1.xml">
+    <edmx:Include Namespace="Endpoint"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Port_v1.xml">
+    <edmx:Include Namespace="Port"/>
+  </edmx:Reference>
+
+  <edmx:DataServices>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="VirtualCXLSwitch">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+
+      <EntityType Name="VirtualCXLSwitch" BaseType="Resource.v1_0_0.Resource" Abstract="true">
+        <Annotation Term="OData.Description" String="The Virtual CXL Switch describes the virtual component with the CXL switch that is governed by a list of rules as prescribed in the CXL specification."/>
+        <Annotation Term="OData.LongDescription" String="This resource shall represent a VCS entity within a CXL switch.  The CXL Specification contains the complete definition of a Virtual CXL Switch."/>
+        <Annotation Term="Capabilities.InsertRestrictions">
+          <Record>
+            <PropertyValue Property="Insertable" Bool="false"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Capabilities.UpdateRestrictions">
+          <Record>
+            <PropertyValue Property="Updatable" Bool="false"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Capabilities.DeleteRestrictions">
+          <Record>
+            <PropertyValue Property="Deletable" Bool="false"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Redfish.Uris">
+          <Collection>
+            <String>/redfish/v1/Fabrics/{FabricId}/Switches/{SwitchId}/VCSs/{VirtualCXLSwitchId}</String>
+          </Collection>
+        </Annotation>
+      </EntityType>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="VirtualCXLSwitch.v1_0_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2025.2"/>
+
+      <EntityType Name="VirtualCXLSwitch" BaseType="VirtualCXLSwitch.VirtualCXLSwitch">
+        <Property Name="Status" Type="Resource.Status" Nullable="false">
+          <Annotation Term="OData.Description" String="The status and health of the resource and its subordinate or dependent resources."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain any status or health properties of the resource."/>
+        </Property>
+        <Property Name="VCSId" Type="Edm.String" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The Virtual CXL Switch identifier."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the identifier of the Virtual CXL Switch."/>
+        </Property>
+        <Property Name="HDMDecoders" Type="Edm.Int64" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The number of HDM (Host Device Memory) decoders present in this Virtual CXL Switch."/>
+          <Annotation Term="OData.LongDescription" String="The number of HDM (Host Device Memory) decoders present in this Virtual CXL Switch."/>
+        </Property>
+        <NavigationProperty Name="VPPBs" Type="VirtualPCI2PCIBridgeCollection.VirtualPCI2PCIBridgeCollection" ContainsTarget="true" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The link to the collection of vPPBs (Virtual PCI-to-PCI Bridges) for this Virtual CXL Switch."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource collection of type `VirtualPCI2PCIBridgeCollection`."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+        <Property Name="Actions" Type="VirtualCXLSwitch.v1_0_0.Actions" Nullable="false">
+          <Annotation Term="OData.Description" String="The available actions for this resource."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the available actions for this resource."/>
+        </Property>
+        <Property Name="Links" Type="VirtualCXLSwitch.v1_0_0.Links" Nullable="false">
+          <Annotation Term="OData.Description" String="The links to other resources that are related to this resource."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain links to resources that are related to but are not contained by, or subordinate to, this resource."/>
+        </Property>
+      </EntityType>
+
+      <ComplexType Name="Links" BaseType="Resource.Links">
+        <Annotation Term="OData.Description" String="The links to other resources that are related to this resource."/>
+        <Annotation Term="OData.LongDescription" String="This Redfish Specification-described type shall contain links to resources that are related to but are not contained by, or subordinate to, this resource."/>
+        <NavigationProperty Name="Endpoints" Type="Collection(Endpoint.Endpoint)">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The links to the endpoints designated for this Virtual CXL Switch."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an array of links to resources of type `Endpoint` that represent the endpoints for this Virtual CXL Switch."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+        <NavigationProperty Name="Port" Type="Port.Port" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The link to the local upstream port of the switch that is physically connected to a host or another switch for this Virtual CXL Switch."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource of type `Port` that represents the local upstream port of the switch that is physically connected to a host or another switch for this Virtual CXL Switch."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+      </ComplexType>
+
+      <ComplexType Name="Actions">
+        <Annotation Term="OData.AdditionalProperties" Bool="false"/>
+        <Annotation Term="OData.Description" String="The available actions for this resource."/>
+        <Annotation Term="OData.LongDescription" String="This type shall contain the available actions for this resource."/>
+        <Property Name="Oem" Type="VirtualCXLSwitch.v1_0_0.OemActions" Nullable="false">
+          <Annotation Term="OData.Description" String="The available OEM-specific actions for this resource."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the available OEM-specific actions for this resource."/>
+        </Property>
+      </ComplexType>
+
+      <ComplexType Name="OemActions">
+        <Annotation Term="OData.AdditionalProperties" Bool="true"/>
+        <Annotation Term="OData.Description" String="The available OEM-specific actions for this resource."/>
+        <Annotation Term="OData.LongDescription" String="This type shall contain the available OEM-specific actions for this resource."/>
+      </ComplexType>
+    </Schema>
+
+  </edmx:DataServices>
+</edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/VirtualPCI2PCIBridgeCollection_v1.xml b/redfish-core/schema/dmtf/csdl/VirtualPCI2PCIBridgeCollection_v1.xml
new file mode 100644
index 0000000..cd42119
--- /dev/null
+++ b/redfish-core/schema/dmtf/csdl/VirtualPCI2PCIBridgeCollection_v1.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!---->
+<!--################################################################################       -->
+<!--# Redfish Schema:  VirtualPCI2PCIBridgeCollection                                      -->
+<!--#                                                                                      -->
+<!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
+<!--# available at http://www.dmtf.org/standards/redfish                                   -->
+<!--# Copyright 2014-2025 DMTF.                                                            -->
+<!--# For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright -->
+<!--################################################################################       -->
+<!---->
+<edmx:Edmx xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx" Version="4.0">
+
+  <edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Core.V1.xml">
+    <edmx:Include Namespace="Org.OData.Core.V1" Alias="OData"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Capabilities.V1.xml">
+    <edmx:Include Namespace="Org.OData.Capabilities.V1" Alias="Capabilities"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Resource_v1.xml">
+    <edmx:Include Namespace="Resource.v1_0_0"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/RedfishExtensions_v1.xml">
+    <edmx:Include Namespace="RedfishExtensions.v1_0_0" Alias="Redfish"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/VirtualPCI2PCIBridge_v1.xml">
+    <edmx:Include Namespace="VirtualPCI2PCIBridge"/>
+  </edmx:Reference>
+
+  <edmx:DataServices>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="VirtualPCI2PCIBridgeCollection">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+
+      <EntityType Name="VirtualPCI2PCIBridgeCollection" BaseType="Resource.v1_0_0.ResourceCollection">
+        <Annotation Term="OData.Description" String="The collection of `VirtualPCI2PCIBridge` resource instances."/>
+        <Annotation Term="OData.LongDescription" String="This resource shall represent a resource collection of `VirtualPCI2PCIBridge` instances for a Redfish implementation."/>
+        <Annotation Term="Capabilities.InsertRestrictions">
+          <Record>
+            <PropertyValue Property="Insertable" Bool="false"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Capabilities.UpdateRestrictions">
+          <Record>
+            <PropertyValue Property="Updatable" Bool="false"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Capabilities.DeleteRestrictions">
+          <Record>
+            <PropertyValue Property="Deletable" Bool="false"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Redfish.Uris">
+          <Collection>
+            <String>/redfish/v1/Fabrics/{FabricId}/Switches/{SwitchId}/VCSs/{VirtualCXLSwitchId}/VPPBs</String>
+          </Collection>
+        </Annotation>
+        <NavigationProperty Name="Members" Type="Collection(VirtualPCI2PCIBridge.VirtualPCI2PCIBridge)">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The members of this collection."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an array of links to the members of this collection."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+          <Annotation Term="Redfish.Required"/>
+        </NavigationProperty>
+      </EntityType>
+    </Schema>
+
+  </edmx:DataServices>
+</edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/VirtualPCI2PCIBridge_v1.xml b/redfish-core/schema/dmtf/csdl/VirtualPCI2PCIBridge_v1.xml
new file mode 100644
index 0000000..29be286
--- /dev/null
+++ b/redfish-core/schema/dmtf/csdl/VirtualPCI2PCIBridge_v1.xml
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!---->
+<!--################################################################################       -->
+<!--# Redfish Schema:  VirtualPCI2PCIBridge v1.0.0                                         -->
+<!--#                                                                                      -->
+<!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
+<!--# available at http://www.dmtf.org/standards/redfish                                   -->
+<!--# Copyright 2014-2025 DMTF.                                                            -->
+<!--# For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright -->
+<!--################################################################################       -->
+<!---->
+<edmx:Edmx xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx" Version="4.0">
+
+  <edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Core.V1.xml">
+    <edmx:Include Namespace="Org.OData.Core.V1" Alias="OData"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Capabilities.V1.xml">
+    <edmx:Include Namespace="Org.OData.Capabilities.V1" Alias="Capabilities"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Measures.V1.xml">
+    <edmx:Include Namespace="Org.OData.Measures.V1" Alias="Measures"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/RedfishExtensions_v1.xml">
+    <edmx:Include Namespace="RedfishExtensions.v1_0_0" Alias="Redfish"/>
+    <edmx:Include Namespace="Validation.v1_0_0" Alias="Validation"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Resource_v1.xml">
+    <edmx:Include Namespace="Resource"/>
+    <edmx:Include Namespace="Resource.v1_0_0"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Endpoint_v1.xml">
+    <edmx:Include Namespace="Endpoint"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Port_v1.xml">
+    <edmx:Include Namespace="Port"/>
+  </edmx:Reference>
+
+  <edmx:DataServices>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="VirtualPCI2PCIBridge">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+
+      <EntityType Name="VirtualPCI2PCIBridge" BaseType="Resource.v1_0_0.Resource" Abstract="true">
+        <Annotation Term="OData.Description" String="The `VirtualPCI2PCIBridge` schema describes Virtual PCI-to-PCI Bridge (vPPB) inside a CXL switch that is owned by the host."/>
+        <Annotation Term="OData.LongDescription" String="This resource shall represent a Virtual PCI-to-PCI Bridge (vPPB) inside a CXL switch that is host-owned.  This can be bound to a port that is either disconnected, connected to a PCIe component, or connected to a CXL component."/>
+        <Annotation Term="Capabilities.InsertRestrictions">
+          <Record>
+            <PropertyValue Property="Insertable" Bool="false"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Capabilities.UpdateRestrictions">
+          <Record>
+            <PropertyValue Property="Updatable" Bool="true"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Capabilities.DeleteRestrictions">
+          <Record>
+            <PropertyValue Property="Deletable" Bool="false"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Redfish.Uris">
+          <Collection>
+            <String>/redfish/v1/Fabrics/{FabricId}/Switches/{SwitchId}/VCSs/{VirtualCXLSwitchId}/VPPBs/{VirtualPCI2PCIBridgeId}</String>
+          </Collection>
+        </Annotation>
+      </EntityType>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="VirtualPCI2PCIBridge.v1_0_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2025.2"/>
+
+      <EntityType Name="VirtualPCI2PCIBridge" BaseType="VirtualPCI2PCIBridge.VirtualPCI2PCIBridge">
+        <Property Name="Status" Type="Resource.Status" Nullable="false">
+          <Annotation Term="OData.Description" String="The status and health of the resource and its subordinate or dependent resources."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain any status or health properties of the resource."/>
+        </Property>
+        <Property Name="VPPBId" Type="Edm.String">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The Virtual PCI-PCI Bridge identifier."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the identifier of the vPPB.  This property shall contain the same value as the `Id` property."/>
+        </Property>
+        <Property Name="BindingStatus" Type="VirtualPCI2PCIBridge.v1_0_0.vPPBStatusTypes" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The binding status of the vPPB."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the binding status of the vPPB."/>
+        </Property>
+        <Property Name="BoundPortId" Type="Edm.Int64" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The physical port number of the bound port."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the physical port number of the port bound to this vPPB.  This property shall only be present if `BindingStatus` contains `BoundPhysicalPort` or `BoundLD`."/>
+        </Property>
+        <Property Name="BoundLDId" Type="Edm.Int64" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The identifier of the bound local logical device."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the identifier of the bound local logical device bound to this vPPB.  This property shall only be present if `BindingStatus` contains `BoundLD`."/>
+        </Property>
+        <Property Name="BoundPBRId" Type="Edm.Int64" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The identifier of the bound PBR."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the identifier of PBR bound to this vPPB.  This property shall only be present if `BindingStatus` contains `BoundPID`."/>
+        </Property>
+        <Property Name="GCXLID" Type="Edm.String">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The GCXLID for the CXL logical device bound to this vPPB."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the globally unique CXL logical device identifier (GCXLID) for the CXL logical device that is bound to this vPPB."/>
+          <Annotation Term="Validation.Pattern" String="^([0-9A-Fa-f]{2}-){7}[0-9A-Fa-f]{2}:([0-9A-Fa-f]{4})$"/>
+        </Property>
+        <Property Name="Actions" Type="VirtualPCI2PCIBridge.v1_0_0.Actions" Nullable="false">
+          <Annotation Term="OData.Description" String="The available actions for this resource."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the available actions for this resource."/>
+        </Property>
+        <Property Name="Links" Type="VirtualPCI2PCIBridge.v1_0_0.Links" Nullable="false">
+          <Annotation Term="OData.Description" String="The links to other resources that are related to this resource."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain links to resources that are related to but are not contained by, or subordinate to, this resource."/>
+        </Property>
+      </EntityType>
+
+      <ComplexType Name="Links" BaseType="Resource.Links">
+        <Annotation Term="OData.Description" String="The links to other resources that are related to this resource."/>
+        <Annotation Term="OData.LongDescription" String="This Redfish Specification-described type shall contain links to resources that are related to but are not contained by, or subordinate to, this resource."/>
+        <NavigationProperty Name="Endpoints" Type="Collection(Endpoint.Endpoint)">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The links to the endpoints associated with this vPPB."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an array of links to resources of type `Endpoint` that represent the endpoints associated with this vPPB."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+        <NavigationProperty Name="Port" Type="Port.Port">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="The link to the port associated with this vPPB."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource of type `Port` that represents the port associated with this vPPB."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+      </ComplexType>
+
+      <EnumType Name="vPPBStatusTypes">
+        <Member Name="Unbound">
+          <Annotation Term="OData.Description" String="This vPPB is in unbound state."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the CXL Specification-defined 'Unbound' state for the vPPB."/>
+        </Member>
+        <Member Name="Busy">
+          <Annotation Term="OData.Description" String="Binding or unbinding is in progress for this vPPB."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the CXL Specification-defined 'Binding or Unbinding' state for the vPPB."/>
+        </Member>
+        <Member Name="BoundPhysicalPort">
+          <Annotation Term="OData.Description" String="This vPPB is bound to a physical port."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the CXL Specification-defined 'Bound Physical Port' state for the vPPB."/>
+        </Member>
+        <Member Name="BoundLD">
+          <Annotation Term="OData.Description" String="This vPPB is bound to a CXL logical device."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the CXL Specification-defined 'Bound LD' state for the vPPB."/>
+        </Member>
+        <Member Name="BoundPID">
+          <Annotation Term="OData.Description" String="This vPPB is bound to a PBR ID."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the CXL Specification-defined 'Bound PBR Id' state for the vPPB."/>
+        </Member>
+      </EnumType>
+
+      <ComplexType Name="Actions">
+        <Annotation Term="OData.AdditionalProperties" Bool="false"/>
+        <Annotation Term="OData.Description" String="The available actions for this resource."/>
+        <Annotation Term="OData.LongDescription" String="This type shall contain the available actions for this resource."/>
+        <Property Name="Oem" Type="VirtualPCI2PCIBridge.v1_0_0.OemActions" Nullable="false">
+          <Annotation Term="OData.Description" String="The available OEM-specific actions for this resource."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the available OEM-specific actions for this resource."/>
+        </Property>
+      </ComplexType>
+
+      <ComplexType Name="OemActions">
+        <Annotation Term="OData.AdditionalProperties" Bool="true"/>
+        <Annotation Term="OData.Description" String="The available OEM-specific actions for this resource."/>
+        <Annotation Term="OData.LongDescription" String="This type shall contain the available OEM-specific actions for this resource."/>
+      </ComplexType>
+    </Schema>
+
+  </edmx:DataServices>
+</edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/Volume_v1.xml b/redfish-core/schema/dmtf/csdl/Volume_v1.xml
index bba8c53..7f2a2d3 100644
--- a/redfish-core/schema/dmtf/csdl/Volume_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/Volume_v1.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
-<!-- Copyright 2015-2024 Storage Networking Industry Association (SNIA), USA. All rights reserved.-->
+<!-- Copyright 2015-2025 Storage Networking Industry Association (SNIA), USA. All rights reserved.-->
 
 <edmx:Edmx xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx" Version="4.0">
 
@@ -41,7 +41,6 @@
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/swordfish/v1/Capacity_v1.xml">
     <edmx:Include Namespace="Capacity"/>
-    <edmx:Include Namespace="Capacity.v1_0_0"/>
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/swordfish/v1/StoragePoolCollection_v1.xml">
     <edmx:Include Namespace="StoragePoolCollection"/>
@@ -88,6 +87,8 @@
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Volume">
       <Annotation Term="Redfish.OwningEntity" String="SNIA"/>
+      <Annotation Term="Redfish.Language" String="en"/>
+
       <EntityType Name="Volume" BaseType="Resource.v1_0_0.Resource" Abstract="true">
         <Annotation Term="OData.Description" String="Volume contains properties used to describe a volume, virtual disk, LUN, or other logical storage entity for any system."/>
         <Annotation Term="OData.LongDescription" String="This resource shall be used to represent a volume, virtual disk, logical disk, LUN, or other logical storage for a Redfish implementation."/>
@@ -932,7 +933,7 @@
           <Annotation Term="OData.LongDescription" String="This property shall contain size of the largest addressable unit of this storage volume."/>
           <Annotation Term="Measures.Unit" String="By"/>
         </Property>
-        <Property Name="Capacity" Type="Capacity.v1_0_0.Capacity" Nullable="false">
+        <Property Name="Capacity" Type="Capacity.Capacity" Nullable="false">
           <Annotation Term="OData.Description" String="Capacity utilization."/>
           <Annotation Term="OData.LongDescription" String="Information about the utilization of capacity allocated to this storage volume."/>
         </Property>
@@ -1107,6 +1108,12 @@
       <EntityType Name="Volume" BaseType="Volume.v1_2_5.Volume"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Volume.v1_2_7">
+      <Annotation Term="Redfish.OwningEntity" String="SNIA"/>
+     <Annotation Term="OData.LongDescription" String="Change Capacity references to unversioned."/>
+      <EntityType Name="Volume" BaseType="Volume.v1_2_6.Volume"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Volume.v1_3_0">
       <Annotation Term="Redfish.OwningEntity" String="SNIA"/>
       <Annotation Term="Redfish.Release" String="1.0.6a"/>
@@ -1178,6 +1185,12 @@
       <EntityType Name="Volume" BaseType="Volume.v1_3_4.Volume"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Volume.v1_3_6">
+      <Annotation Term="Redfish.OwningEntity" String="SNIA"/>
+     <Annotation Term="OData.LongDescription" String="Change Capacity references to unversioned."/>
+      <EntityType Name="Volume" BaseType="Volume.v1_3_5.Volume"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Volume.v1_4_0">
       <Annotation Term="Redfish.OwningEntity" String="SNIA"/>
       <Annotation Term="Redfish.Release" String="1.1.0"/>
@@ -1308,6 +1321,12 @@
       <EntityType Name="Volume" BaseType="Volume.v1_4_3.Volume"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Volume.v1_4_5">
+      <Annotation Term="Redfish.OwningEntity" String="SNIA"/>
+     <Annotation Term="OData.LongDescription" String="Change Capacity references to unversioned."/>
+      <EntityType Name="Volume" BaseType="Volume.v1_4_4.Volume"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Volume.v1_5_0">
       <Annotation Term="Redfish.OwningEntity" String="SNIA"/>
       <Annotation Term="Redfish.Release" String="1.2.0"/>
@@ -1436,6 +1455,12 @@
       <EntityType Name="Volume" BaseType="Volume.v1_5_1.Volume"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Volume.v1_5_3">
+      <Annotation Term="Redfish.OwningEntity" String="SNIA"/>
+     <Annotation Term="OData.LongDescription" String="Change Capacity references to unversioned."/>
+      <EntityType Name="Volume" BaseType="Volume.v1_5_2.Volume"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Volume.v1_6_0">
       <Annotation Term="Redfish.OwningEntity" String="SNIA"/>
       <Annotation Term="Redfish.Release" String="1.2.1"/>
@@ -1483,6 +1508,12 @@
       <EntityType Name="Volume" BaseType="Volume.v1_6_2.Volume"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Volume.v1_6_4">
+      <Annotation Term="Redfish.OwningEntity" String="SNIA"/>
+     <Annotation Term="OData.LongDescription" String="Change Capacity references to unversioned."/>
+      <EntityType Name="Volume" BaseType="Volume.v1_6_3.Volume"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Volume.v1_7_0">
       <Annotation Term="Redfish.OwningEntity" String="SNIA"/>
       <Annotation Term="OData.Description" String="This version was created to add the IsBootCapable property."/>
@@ -1504,6 +1535,12 @@
       <EntityType Name="Volume" BaseType="Volume.v1_7_0.Volume"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Volume.v1_7_2">
+      <Annotation Term="Redfish.OwningEntity" String="SNIA"/>
+     <Annotation Term="OData.LongDescription" String="Change Capacity references to unversioned."/>
+      <EntityType Name="Volume" BaseType="Volume.v1_7_1.Volume"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Volume.v1_8_0">
       <Annotation Term="Redfish.OwningEntity" String="SNIA"/>
       <Annotation Term="OData.Description" String="This version was created to add the LBAFormatsSupported and Type properties to NVMeNamespaceProperties. It also adds IsBound=true to Actions where missing."/>
@@ -1537,6 +1574,12 @@
       <EntityType Name="Volume" BaseType="Volume.v1_8_0.Volume"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Volume.v1_8_2">
+      <Annotation Term="Redfish.OwningEntity" String="SNIA"/>
+     <Annotation Term="OData.LongDescription" String="Change Capacity references to unversioned."/>
+      <EntityType Name="Volume" BaseType="Volume.v1_8_1.Volume"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Volume.v1_9_0">
       <Annotation Term="Redfish.OwningEntity" String="SNIA"/>
       <Annotation Term="OData.Description" String="This version add support for NamespaceTypes and Volume Metrics. It also adds a Link to Controllers (StorageControllers), and adds Operation type to Volume, deprecating OperationName, and removes the erroneous AutoExpandReferences from the RemoteReplicaTargets property. It adds Connections, and deprecates StorageGroups. It also adds ReplicationEnabled."/>
@@ -1637,6 +1680,12 @@
       <EntityType Name="Volume" BaseType="Volume.v1_9_0.Volume"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Volume.v1_9_2">
+      <Annotation Term="Redfish.OwningEntity" String="SNIA"/>
+     <Annotation Term="OData.LongDescription" String="Change Capacity references to unversioned."/>
+      <EntityType Name="Volume" BaseType="Volume.v1_9_1.Volume"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Volume.v1_10_0">
       <Annotation Term="Redfish.OwningEntity" String="SNIA"/>
       <Annotation Term="OData.Description" String="This version was created to add ChangeStripSize to the OperationType enum, add the ALUA property for Reservations, and add ProvidingStoragePool to Links. It adds SupportsMultipleNamespaceAttachments and SupportsIOPerformanceHints to NVMeNamespaceProperties. It also deprecates IOStatistics in favor of IOStatistics in VolumeMetrics."/>
@@ -1688,5 +1737,11 @@
       <EntityType Name="Volume" BaseType="Volume.v1_10_0.Volume"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Volume.v1_10_2">
+      <Annotation Term="Redfish.OwningEntity" String="SNIA"/>
+     <Annotation Term="OData.LongDescription" String="Change Capacity references to unversioned."/>
+      <EntityType Name="Volume" BaseType="Volume.v1_10_1.Volume"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/json-schema/AggregationSource.v1_4_3.json b/redfish-core/schema/dmtf/json-schema/AggregationSource.v1_5_0.json
similarity index 96%
rename from redfish-core/schema/dmtf/json-schema/AggregationSource.v1_4_3.json
rename to redfish-core/schema/dmtf/json-schema/AggregationSource.v1_5_0.json
index b7b697b..40d1b8d 100644
--- a/redfish-core/schema/dmtf/json-schema/AggregationSource.v1_4_3.json
+++ b/redfish-core/schema/dmtf/json-schema/AggregationSource.v1_5_0.json
@@ -1,8 +1,8 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/AggregationSource.v1_4_3.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/AggregationSource.v1_5_0.json",
     "$ref": "#/definitions/AggregationSource",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
-    "copyright": "Copyright 2014-2024 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
+    "copyright": "Copyright 2014-2025 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
     "definitions": {
         "Actions": {
             "additionalProperties": false,
@@ -110,6 +110,16 @@
                     "description": "The links to other resources that are related to this resource.",
                     "longDescription": "This property shall contain links to resources that are related to but are not contained by, or subordinate to, this resource."
                 },
+                "ModbusTargetServerId": {
+                    "description": "The Modbus identifier of this aggregation source.",
+                    "longDescription": "This property shall contain the Modbus identifier of this aggregation source.",
+                    "readonly": false,
+                    "type": [
+                        "integer",
+                        "null"
+                    ],
+                    "versionAdded": "v1_5_0"
+                },
                 "Name": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Name",
                     "readonly": true
@@ -129,6 +139,17 @@
                     ],
                     "writeOnly": true
                 },
+                "Port": {
+                    "description": "The network port.",
+                    "longDescription": "This property shall contain the network port used to connect to this aggregation source.",
+                    "minimum": 0,
+                    "readonly": false,
+                    "type": [
+                        "integer",
+                        "null"
+                    ],
+                    "versionAdded": "v1_5_0"
+                },
                 "SNMP": {
                     "$ref": "#/definitions/SNMPSettings",
                     "description": "SNMP settings of the aggregation source.",
@@ -575,6 +596,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2023.3",
-    "title": "#AggregationSource.v1_4_3.AggregationSource"
+    "release": "2025.2",
+    "title": "#AggregationSource.v1_5_0.AggregationSource"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/AutomationInstrumentation.v1_0_0.json b/redfish-core/schema/dmtf/json-schema/AutomationInstrumentation.v1_0_0.json
new file mode 100644
index 0000000..5914efd
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema/AutomationInstrumentation.v1_0_0.json
@@ -0,0 +1,204 @@
+{
+    "$id": "http://redfish.dmtf.org/schemas/v1/AutomationInstrumentation.v1_0_0.json",
+    "$ref": "#/definitions/AutomationInstrumentation",
+    "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
+    "copyright": "Copyright 2014-2025 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
+    "definitions": {
+        "Actions": {
+            "additionalProperties": false,
+            "description": "The available actions for this resource.",
+            "longDescription": "This type shall contain the available actions for this resource.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "Oem": {
+                    "$ref": "#/definitions/OemActions",
+                    "description": "The available OEM-specific actions for this resource.",
+                    "longDescription": "This property shall contain the available OEM-specific actions for this resource."
+                }
+            },
+            "type": "object"
+        },
+        "AutomationInstrumentation": {
+            "additionalProperties": false,
+            "description": "The `AutomationInstrumentation` schema contains measurements and set points for an automation node.",
+            "longDescription": "This resource shall represent automation node instrumentation for a Redfish implementation.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "@odata.context": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/context"
+                },
+                "@odata.etag": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/etag"
+                },
+                "@odata.id": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/id"
+                },
+                "@odata.type": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/type"
+                },
+                "Actions": {
+                    "$ref": "#/definitions/Actions",
+                    "description": "The available actions for this resource.",
+                    "longDescription": "This property shall contain the available actions for this resource."
+                },
+                "CurrentAmps": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Sensor.json#/definitions/SensorCurrentExcerpt"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The current (A) for this node.",
+                    "excerptCopy": "SensorCurrentExcerpt",
+                    "longDescription": "This property shall contain the current, in ampere units, for this automation node.  The value of the `DataSourceUri` property, if present, shall reference a resource of type `Sensor` with the `ReadingType` property containing the value `Current`."
+                },
+                "Description": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Description"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "readonly": true
+                },
+                "Id": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Id",
+                    "readonly": true
+                },
+                "Name": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Name",
+                    "readonly": true
+                },
+                "NodeControl": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Control.json#/definitions/ControlNodeExcerpt"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The control for this node.",
+                    "excerptCopy": "ControlNodeExcerpt",
+                    "longDescription": "This property shall contain the control for this resource.  The value of the `DataSourceUri` property, if present, shall reference a resource of type `Control`."
+                },
+                "NodeState": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/AutomationNode.json#/definitions/NodeState",
+                    "description": "The current state of the node.",
+                    "longDescription": "This parameter shall specify the current state of the automation node.",
+                    "readonly": true
+                },
+                "Oem": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Oem",
+                    "description": "The OEM extension property.",
+                    "longDescription": "This property shall contain the OEM extensions.  All values for properties that this object contains shall conform to the Redfish Specification-described requirements."
+                },
+                "PID": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Control.json#/definitions/ControlSingleLoopExcerpt"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "A PID control loop.",
+                    "excerptCopy": "ControlSingleLoopExcerpt",
+                    "longDescription": "This property shall contain a PID-based control loop for this resource.  The value of the `DataSourceUri` property, if present, shall reference a resource of type `Control`."
+                },
+                "Status": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Status",
+                    "description": "The status and health of a resource and its children.",
+                    "longDescription": "This type shall contain any status or health properties of a resource."
+                },
+                "TemperatureCelsius": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Sensor.json#/definitions/SensorExcerpt"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "Temperature (Celsius).",
+                    "excerptCopy": "SensorExcerpt",
+                    "longDescription": "This property shall contain the temperature, in degree Celsius units, for this resource.  The value of the `DataSourceUri` property, if present, shall reference a resource of type `Sensor` with the `ReadingType` property containing the value `Temperature`."
+                },
+                "Voltage": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Sensor.json#/definitions/SensorVoltageExcerpt"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The voltage (V) for this node.",
+                    "excerptCopy": "SensorVoltageExcerpt",
+                    "longDescription": "This property shall contain the voltage, in volt units, for this automation node.  The value of the `DataSourceUri` property, if present, shall reference a resource of type `Sensor` with the `ReadingType` property containing the value `Voltage`."
+                }
+            },
+            "required": [
+                "@odata.id",
+                "@odata.type",
+                "Id",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "OemActions": {
+            "additionalProperties": true,
+            "description": "The available OEM-specific actions for this resource.",
+            "longDescription": "This type shall contain the available OEM-specific actions for this resource.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {},
+            "type": "object"
+        }
+    },
+    "owningEntity": "DMTF",
+    "release": "2025.2",
+    "title": "#AutomationInstrumentation.v1_0_0.AutomationInstrumentation"
+}
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/AutomationNode.v1_0_0.json b/redfish-core/schema/dmtf/json-schema/AutomationNode.v1_0_0.json
new file mode 100644
index 0000000..be88857
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema/AutomationNode.v1_0_0.json
@@ -0,0 +1,479 @@
+{
+    "$id": "http://redfish.dmtf.org/schemas/v1/AutomationNode.v1_0_0.json",
+    "$ref": "#/definitions/AutomationNode",
+    "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
+    "copyright": "Copyright 2014-2025 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
+    "definitions": {
+        "Actions": {
+            "additionalProperties": false,
+            "description": "The available actions for this resource.",
+            "longDescription": "This type shall contain the available actions for this resource.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "#AutomationNode.Reset": {
+                    "$ref": "#/definitions/Reset"
+                },
+                "#AutomationNode.SendTrigger": {
+                    "$ref": "#/definitions/SendTrigger"
+                },
+                "#AutomationNode.Start": {
+                    "$ref": "#/definitions/Start"
+                },
+                "#AutomationNode.Stop": {
+                    "$ref": "#/definitions/Stop"
+                },
+                "#AutomationNode.Wait": {
+                    "$ref": "#/definitions/Wait"
+                },
+                "Oem": {
+                    "$ref": "#/definitions/OemActions",
+                    "description": "The available OEM-specific actions for this resource.",
+                    "longDescription": "This property shall contain the available OEM-specific actions for this resource."
+                }
+            },
+            "type": "object"
+        },
+        "AutomationNode": {
+            "additionalProperties": false,
+            "description": "The `AutomationNode` schema describes a node that carries out instructions in industrial automation environments.",
+            "longDescription": "This resource shall represent an automation node for a Redfish implementation.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "@odata.context": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/context"
+                },
+                "@odata.etag": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/etag"
+                },
+                "@odata.id": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/id"
+                },
+                "@odata.type": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/type"
+                },
+                "Actions": {
+                    "$ref": "#/definitions/Actions",
+                    "description": "The available actions for this resource.",
+                    "longDescription": "This property shall contain the available actions for this resource."
+                },
+                "Description": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Description"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "readonly": true
+                },
+                "Id": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Id",
+                    "readonly": true
+                },
+                "Instrumentation": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/AutomationInstrumentation.json#/definitions/AutomationInstrumentation",
+                    "description": "A link to the instrumentation for this node.",
+                    "longDescription": "This property shall contain a link to a resource of type `AutomationInstrumentation` that represents the instrumentation for this automation node.",
+                    "readonly": true
+                },
+                "Links": {
+                    "$ref": "#/definitions/Links",
+                    "description": "The links to other resources that are related to this resource.",
+                    "longDescription": "This property shall contain links to resources that are related to but are not contained by, or subordinate to, this resource."
+                },
+                "MotionAxis": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/MotionAxisType"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The primary axis of motion for this motion-related node.",
+                    "longDescription": "This property shall contain the primary axis of motion for this motion-related node.",
+                    "readonly": false
+                },
+                "MotionProfile": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/MotionProfileType"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The motion profile type used for this node.",
+                    "longDescription": "This property shall contain the type of motion profile used for this motion-based node.",
+                    "readonly": false
+                },
+                "Name": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Name",
+                    "readonly": true
+                },
+                "NodeState": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/AutomationNode.json#/definitions/NodeState",
+                    "description": "The current state of the node.",
+                    "longDescription": "This property shall contain the current state of the automation node.",
+                    "readonly": true
+                },
+                "NodeType": {
+                    "$ref": "#/definitions/NodeType",
+                    "description": "The type of automation node.",
+                    "longDescription": "This property shall contain the type for the automation node.",
+                    "readonly": true
+                },
+                "Oem": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Oem",
+                    "description": "The OEM extension property.",
+                    "longDescription": "This property shall contain the OEM extensions.  All values for properties that this object contains shall conform to the Redfish Specification-described requirements."
+                },
+                "Status": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Status",
+                    "description": "The status and health of a resource and its children.",
+                    "longDescription": "This type shall contain any status or health properties of a resource."
+                }
+            },
+            "required": [
+                "@odata.id",
+                "@odata.type",
+                "Id",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "Links": {
+            "additionalProperties": false,
+            "description": "The links to other resources that are related to this resource.",
+            "longDescription": "This Redfish Specification-described type shall contain links to resources that are related to but are not contained by, or subordinate to, this resource.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "AutomationNodeGroup": {
+                    "description": "An array of links to the automation nodes that are included in an automation node group.",
+                    "items": {
+                        "$ref": "http://redfish.dmtf.org/schemas/v1/AutomationNode.json#/definitions/AutomationNode"
+                    },
+                    "longDescription": "This property shall contain an array of links to resources of type `AutomationNode` that represent the nodes that provide the functionality of this group.",
+                    "readonly": true,
+                    "type": "array"
+                },
+                "AutomationNodeGroup@odata.count": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
+                },
+                "Chassis": {
+                    "description": "An array of links to the chassis that contain this equipment.",
+                    "items": {
+                        "$ref": "http://redfish.dmtf.org/schemas/v1/Chassis.json#/definitions/Chassis"
+                    },
+                    "longDescription": "This property shall contain an array of links to resources of type `Chassis` that represent the physical containers that contain this equipment.",
+                    "readonly": true,
+                    "type": "array"
+                },
+                "Chassis@odata.count": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
+                },
+                "Oem": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Oem",
+                    "description": "The OEM extension property.",
+                    "longDescription": "This property shall contain the OEM extensions.  All values for properties contained in this object shall conform to the Redfish Specification-described requirements."
+                },
+                "OutputControl": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Control.json#/definitions/Control",
+                    "description": "A link to the output control.",
+                    "longDescription": "This property shall contain a link to a resource of type `Control` that represent the output control associated with this node.",
+                    "readonly": true
+                },
+                "PidFeedbackSensor": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Sensor.json#/definitions/Sensor",
+                    "description": "A link to the PID feedback sensor.",
+                    "longDescription": "This property shall contain a link to a resource of type `Sensor` that represents the feedback sensor associated with this node.  The feedback sensor is intended to return controlled value output in a PID system.",
+                    "readonly": true
+                },
+                "PositionSensor": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Sensor.json#/definitions/Sensor",
+                    "description": "A link to the position sensor.",
+                    "longDescription": "This property shall contain a link to a resource of type `Sensor` that represents the position sensor associated with this node.",
+                    "readonly": true
+                },
+                "VelocitySensor": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Sensor.json#/definitions/Sensor",
+                    "description": "A link to the velocity sensor.",
+                    "longDescription": "This property shall contain a link to a resource of type `Sensor` that represents the velocity sensor associated with this node.",
+                    "readonly": true
+                }
+            },
+            "type": "object"
+        },
+        "MotionAxisType": {
+            "enum": [
+                "X",
+                "Y",
+                "Z",
+                "TwoAxis",
+                "ThreeAxis"
+            ],
+            "enumDescriptions": {
+                "ThreeAxis": "3-axis.",
+                "TwoAxis": "2-axis.",
+                "X": "X axis.",
+                "Y": "Y axis.",
+                "Z": "Z axis."
+            },
+            "type": "string"
+        },
+        "MotionProfileType": {
+            "enum": [
+                "Trapezoidal",
+                "SCurve",
+                "None"
+            ],
+            "enumDescriptions": {
+                "None": "No profile specified.",
+                "SCurve": "S-curve profile.",
+                "Trapezoidal": "Trapezoidal profile."
+            },
+            "type": "string"
+        },
+        "NodeType": {
+            "enum": [
+                "MotionPosition",
+                "MotionVelocity",
+                "MotionPositionGroup",
+                "PID",
+                "Simple"
+            ],
+            "enumDescriptions": {
+                "MotionPosition": "A position-based profiled motion node where position, velocity, and acceleration are all controlled.",
+                "MotionPositionGroup": "A multi-axis position-based profiled motion node where position, velocity and acceleration are all controlled.",
+                "MotionVelocity": "A velocity-based profiled motion node where position, velocity and acceleration are all controlled.",
+                "PID": "A node that attempts to match a set point using a PID control algorithm.",
+                "Simple": "A simple node that incorporates no automated control function."
+            },
+            "type": "string"
+        },
+        "OemActions": {
+            "additionalProperties": true,
+            "description": "The available OEM-specific actions for this resource.",
+            "longDescription": "This type shall contain the available OEM-specific actions for this resource.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {},
+            "type": "object"
+        },
+        "Reset": {
+            "additionalProperties": false,
+            "description": "Resets the node.",
+            "longDescription": "This action shall reset the node to its power-on state.",
+            "parameters": {},
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "target": {
+                    "description": "Link to invoke action",
+                    "format": "uri-reference",
+                    "type": "string"
+                },
+                "title": {
+                    "description": "Friendly action name",
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "SendTrigger": {
+            "additionalProperties": false,
+            "description": "Sends a trigger to the node.",
+            "longDescription": "This action shall pulse the trigger signal for the node.",
+            "parameters": {},
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "target": {
+                    "description": "Link to invoke action",
+                    "format": "uri-reference",
+                    "type": "string"
+                },
+                "title": {
+                    "description": "Friendly action name",
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "Start": {
+            "additionalProperties": false,
+            "description": "Starts the node.",
+            "longDescription": "This action shall transition the node to the `Running` state.  This action shall pulse the trigger signal to other connected nodes that are in the `Waiting` state.",
+            "parameters": {},
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "target": {
+                    "description": "Link to invoke action",
+                    "format": "uri-reference",
+                    "type": "string"
+                },
+                "title": {
+                    "description": "Friendly action name",
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "Stop": {
+            "additionalProperties": false,
+            "description": "Stops the node.",
+            "longDescription": "This action shall transition the node to the `Idle` state.",
+            "parameters": {},
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "target": {
+                    "description": "Link to invoke action",
+                    "format": "uri-reference",
+                    "type": "string"
+                },
+                "title": {
+                    "description": "Friendly action name",
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "Wait": {
+            "additionalProperties": false,
+            "description": "Signals the node to wait for the next instruction.",
+            "longDescription": "This action shall transition the node to the `Waiting` state.",
+            "parameters": {},
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "target": {
+                    "description": "Link to invoke action",
+                    "format": "uri-reference",
+                    "type": "string"
+                },
+                "title": {
+                    "description": "Friendly action name",
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        }
+    },
+    "owningEntity": "DMTF",
+    "release": "2025.2",
+    "title": "#AutomationNode.v1_0_0.AutomationNode"
+}
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/AutomationNodeCollection.json b/redfish-core/schema/dmtf/json-schema/AutomationNodeCollection.json
new file mode 100644
index 0000000..545d401
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema/AutomationNodeCollection.json
@@ -0,0 +1,100 @@
+{
+    "$id": "http://redfish.dmtf.org/schemas/v1/AutomationNodeCollection.json",
+    "$ref": "#/definitions/AutomationNodeCollection",
+    "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
+    "copyright": "Copyright 2014-2025 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
+    "definitions": {
+        "AutomationNodeCollection": {
+            "anyOf": [
+                {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/idRef"
+                },
+                {
+                    "additionalProperties": false,
+                    "description": "The collection of `AutomationNode` resource instances.",
+                    "longDescription": "This resource shall represent a resource collection of `AutomationNode` instances for a Redfish implementation.",
+                    "patternProperties": {
+                        "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                            "description": "This property shall specify a valid odata or Redfish property.",
+                            "type": [
+                                "array",
+                                "boolean",
+                                "integer",
+                                "number",
+                                "null",
+                                "object",
+                                "string"
+                            ]
+                        }
+                    },
+                    "properties": {
+                        "@odata.context": {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/context"
+                        },
+                        "@odata.etag": {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/etag"
+                        },
+                        "@odata.id": {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/id"
+                        },
+                        "@odata.type": {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/type"
+                        },
+                        "Description": {
+                            "anyOf": [
+                                {
+                                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Description"
+                                },
+                                {
+                                    "type": "null"
+                                }
+                            ],
+                            "readonly": true
+                        },
+                        "Members": {
+                            "description": "The members of this collection.",
+                            "items": {
+                                "$ref": "http://redfish.dmtf.org/schemas/v1/AutomationNode.json#/definitions/AutomationNode"
+                            },
+                            "longDescription": "This property shall contain an array of links to the members of this collection.",
+                            "readonly": true,
+                            "type": "array"
+                        },
+                        "Members@odata.count": {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
+                        },
+                        "Members@odata.nextLink": {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/nextLink"
+                        },
+                        "Name": {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Name",
+                            "readonly": true
+                        },
+                        "Oem": {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Oem",
+                            "description": "The OEM extension property.",
+                            "longDescription": "This property shall contain the OEM extensions.  All values for properties contained in this object shall conform to the Redfish Specification-described requirements."
+                        }
+                    },
+                    "required": [
+                        "Members",
+                        "Members@odata.count",
+                        "@odata.id",
+                        "@odata.type",
+                        "Name"
+                    ],
+                    "type": "object"
+                }
+            ],
+            "deletable": false,
+            "insertable": false,
+            "updatable": false,
+            "uris": [
+                "/redfish/v1/AutomationNodes"
+            ]
+        }
+    },
+    "language": "en",
+    "owningEntity": "DMTF",
+    "title": "#AutomationNodeCollection.AutomationNodeCollection"
+}
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/Battery.v1_3_0.json b/redfish-core/schema/dmtf/json-schema/Battery.v1_4_0.json
similarity index 86%
rename from redfish-core/schema/dmtf/json-schema/Battery.v1_3_0.json
rename to redfish-core/schema/dmtf/json-schema/Battery.v1_4_0.json
index aad2f8a..0a0ce06 100644
--- a/redfish-core/schema/dmtf/json-schema/Battery.v1_3_0.json
+++ b/redfish-core/schema/dmtf/json-schema/Battery.v1_4_0.json
@@ -1,8 +1,8 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Battery.v1_3_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Battery.v1_4_0.json",
     "$ref": "#/definitions/Battery",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
-    "copyright": "Copyright 2014-2024 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
+    "copyright": "Copyright 2014-2025 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
     "definitions": {
         "Actions": {
             "additionalProperties": false,
@@ -42,8 +42,8 @@
         },
         "Battery": {
             "additionalProperties": false,
-            "description": "The `Battery` schema describes a battery unit, such as those used to provide systems with power during a power-loss event.  It also describes the location, such as a slot, socket, or bay, where a unit can be installed by populating a resource instance with an absent state if a unit is not present.",
-            "longDescription": "This resource shall represent a battery for a Redfish implementation.  It may also represent a location, such as a slot, socket, or bay, where a unit may be installed if the `State` property within the `Status` property contains `Absent`.",
+            "description": "The `Battery` schema describes a unit of energy storage, including batteries and supercapacitors, used to provide systems or components within a system with power during a power-loss event or to store energy for later use.  It also describes the location, such as a slot, socket, or bay, where a unit can be installed by populating a resource instance with an absent state if a unit is not present.",
+            "longDescription": "This resource shall represent an energy storage device for a Redfish implementation.  It may also represent a location, such as a slot, socket, or bay, where a unit may be installed if the `State` property within the `Status` property contains `Absent`.",
             "patternProperties": {
                 "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
                     "description": "This property shall specify a valid odata or Redfish property.",
@@ -82,6 +82,20 @@
                     "longDescription": "This property shall contain a link to a resource of type `Assembly`.",
                     "readonly": true
                 },
+                "BatteryChemistryType": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/BatteryChemistryType"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The chemistry of the battery.",
+                    "longDescription": "This property shall contain the chemistry of the battery.  This property shall only be present if the `EnergyStorageType` property contains `Battery`.",
+                    "readonly": true,
+                    "versionAdded": "v1_4_0"
+                },
                 "CapacityActualAmpHours": {
                     "description": "The actual maximum capacity of this battery in amp-hour units.",
                     "longDescription": "This property shall contain the actual maximum capacity of this battery in amp-hour units.",
@@ -150,6 +164,20 @@
                     ],
                     "readonly": true
                 },
+                "EnergyStorageType": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/EnergyStorageType"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The type of energy storage technology used in the battery.",
+                    "longDescription": "This property shall contain the energy storage technology used in the battery.",
+                    "readonly": true,
+                    "versionAdded": "v1_4_0"
+                },
                 "FirmwareVersion": {
                     "description": "The firmware version for this battery.",
                     "longDescription": "This property shall contain the firmware version as defined by the manufacturer for this battery.",
@@ -346,6 +374,24 @@
             ],
             "type": "object"
         },
+        "BatteryChemistryType": {
+            "enum": [
+                "LeadAcid",
+                "LithiumIon",
+                "NickelCadmium"
+            ],
+            "enumDescriptions": {
+                "LeadAcid": "Chemical energy stored through lead and acid electrochemical reactions.",
+                "LithiumIon": "Chemical energy stored through lithium ion intercalation reactions.",
+                "NickelCadmium": "Chemical energy stored through nickel and cadmium electrochemical reactions."
+            },
+            "enumLongDescriptions": {
+                "LeadAcid": "The value shall indicate that the battery stores chemical energy using lead and acid electrochemical reactions.",
+                "LithiumIon": "The value shall indicate that the battery stores chemical energy using lithium ion intercalation.",
+                "NickelCadmium": "The value shall indicate that the battery stores chemical energy using nickel and cadmium electrochemical reactions."
+            },
+            "type": "string"
+        },
         "Calibrate": {
             "additionalProperties": false,
             "description": "This action performs a self-calibration, or learn cycle, of the battery.",
@@ -396,6 +442,21 @@
             },
             "type": "string"
         },
+        "EnergyStorageType": {
+            "enum": [
+                "Battery",
+                "Supercapacitor"
+            ],
+            "enumDescriptions": {
+                "Battery": "Energy stored through one or more electrochemical cells.",
+                "Supercapacitor": "Energy stored through electrostatic double-layer capacitors or electrodes with electrochemical pseudocapacitance."
+            },
+            "enumLongDescriptions": {
+                "Battery": "The value shall indicate that the battery stores energy using one or more electrochemical cells.",
+                "Supercapacitor": "The value shall indicate that the battery stores energy using electrostatic double-layer capacitors or electrodes with electrochemical pseudocapacitance."
+            },
+            "type": "string"
+        },
         "Links": {
             "additionalProperties": false,
             "description": "The links to other resources that are related to this resource.",
@@ -543,6 +604,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2024.1",
-    "title": "#Battery.v1_3_0.Battery"
+    "release": "2025.2",
+    "title": "#Battery.v1_4_0.Battery"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/Certificate.v1_9_0.json b/redfish-core/schema/dmtf/json-schema/Certificate.v1_10_0.json
similarity index 96%
rename from redfish-core/schema/dmtf/json-schema/Certificate.v1_9_0.json
rename to redfish-core/schema/dmtf/json-schema/Certificate.v1_10_0.json
index 5ddf3f2..08c99eb 100644
--- a/redfish-core/schema/dmtf/json-schema/Certificate.v1_9_0.json
+++ b/redfish-core/schema/dmtf/json-schema/Certificate.v1_10_0.json
@@ -1,8 +1,8 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Certificate.v1_9_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Certificate.v1_10_0.json",
     "$ref": "#/definitions/Certificate",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
-    "copyright": "Copyright 2014-2024 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
+    "copyright": "Copyright 2014-2025 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
     "definitions": {
         "Actions": {
             "additionalProperties": false,
@@ -178,6 +178,17 @@
                     "description": "The OEM extension property.",
                     "longDescription": "This property shall contain the OEM extensions.  All values for properties that this object contains shall conform to the Redfish Specification-described requirements."
                 },
+                "Password": {
+                    "description": "The password for the certificate.",
+                    "longDescription": "This property shall contain the password for the certificate contained in the `CertificateString` property.  This property shall be required in create requests if the `CertificateType` property contains `PKCS12` and the client-provided certificate is password protected.  This property shall not be present in responses.",
+                    "readonly": false,
+                    "type": [
+                        "string",
+                        "null"
+                    ],
+                    "versionAdded": "v1_10_0",
+                    "writeOnly": true
+                },
                 "SPDM": {
                     "$ref": "#/definitions/SPDM",
                     "description": "SPDM-related information for the certificate.",
@@ -199,6 +210,12 @@
                     "type": "string",
                     "versionAdded": "v1_3_0"
                 },
+                "Status": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Status",
+                    "description": "The status and health of the resource and its subordinate or dependent resources.",
+                    "longDescription": "This property shall contain any status or health properties of the resource.",
+                    "versionAdded": "v1_10_0"
+                },
                 "Subject": {
                     "$ref": "#/definitions/Identifier",
                     "description": "The subject of the certificate.",
@@ -696,6 +713,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2024.3",
-    "title": "#Certificate.v1_9_0.Certificate"
+    "release": "2025.2",
+    "title": "#Certificate.v1_10_0.Certificate"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/CertificateCollection.json b/redfish-core/schema/dmtf/json-schema/CertificateCollection.json
index ef57b9f..06bfe44 100644
--- a/redfish-core/schema/dmtf/json-schema/CertificateCollection.json
+++ b/redfish-core/schema/dmtf/json-schema/CertificateCollection.json
@@ -170,6 +170,13 @@
                 "/redfish/v1/AccountService/OutboundConnections/{OutboundConnectionId}/Certificates",
                 "/redfish/v1/AccountService/OutboundConnections/{OutboundConnectionId}/ClientCertificates",
                 "/redfish/v1/Chassis/{ChassisId}/PowerSubsystem/PowerSupplies/{PowerSupplyId}/Certificates"
+            ],
+            "urisDeprecated": [
+                "/redfish/v1/Systems/{ComputerSystemId}/Storage/{StorageId}/Drives/{DriveId}/Certificates",
+                "/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/Drives/{DriveId}/Certificates",
+                "/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/Drives/{DriveId}/Certificates",
+                "/redfish/v1/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/Drives/{DriveId}/Certificates",
+                "/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/Drives/{DriveId}/Certificates"
             ]
         }
     },
diff --git a/redfish-core/schema/dmtf/json-schema/CertificateService.v1_0_6.json b/redfish-core/schema/dmtf/json-schema/CertificateService.v1_1_0.json
similarity index 96%
rename from redfish-core/schema/dmtf/json-schema/CertificateService.v1_0_6.json
rename to redfish-core/schema/dmtf/json-schema/CertificateService.v1_1_0.json
index 329042b..14d2aef 100644
--- a/redfish-core/schema/dmtf/json-schema/CertificateService.v1_0_6.json
+++ b/redfish-core/schema/dmtf/json-schema/CertificateService.v1_1_0.json
@@ -1,8 +1,8 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/CertificateService.v1_0_6.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/CertificateService.v1_1_0.json",
     "$ref": "#/definitions/CertificateService",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
-    "copyright": "Copyright 2014-2024 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
+    "copyright": "Copyright 2014-2025 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
     "definitions": {
         "Actions": {
             "additionalProperties": false,
@@ -332,6 +332,12 @@
                     "description": "The link to the certificate that is being replaced.",
                     "longDescription": "This parameter shall contain a link to a resource of type `Certificate` that is being replaced.",
                     "requiredParameter": true
+                },
+                "Password": {
+                    "description": "The password for the certificate.",
+                    "longDescription": "This parameter shall contain the password for the certificate contained in the `CertificateString` parameter.  This parameter shall be required if the `CertificateType` parameter contains `PKCS12` and the client-provided certificate is password protected.",
+                    "type": "string",
+                    "versionAdded": "v1_1_0"
                 }
             },
             "patternProperties": {
@@ -364,6 +370,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2018.3",
-    "title": "#CertificateService.v1_0_6.CertificateService"
+    "release": "2025.1",
+    "title": "#CertificateService.v1_1_0.CertificateService"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/Chassis.v1_26_0.json b/redfish-core/schema/dmtf/json-schema/Chassis.v1_27_0.json
similarity index 98%
rename from redfish-core/schema/dmtf/json-schema/Chassis.v1_26_0.json
rename to redfish-core/schema/dmtf/json-schema/Chassis.v1_27_0.json
index 9438fcf..61445ee 100644
--- a/redfish-core/schema/dmtf/json-schema/Chassis.v1_26_0.json
+++ b/redfish-core/schema/dmtf/json-schema/Chassis.v1_27_0.json
@@ -1,8 +1,8 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Chassis.v1_26_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Chassis.v1_27_0.json",
     "$ref": "#/definitions/Chassis",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
-    "copyright": "Copyright 2014-2024 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
+    "copyright": "Copyright 2014-2025 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
     "definitions": {
         "Actions": {
             "additionalProperties": false,
@@ -893,6 +893,19 @@
                 }
             },
             "properties": {
+                "AutomationNodes": {
+                    "description": "An array of links to the automation nodes contained in this chassis.",
+                    "items": {
+                        "$ref": "http://redfish.dmtf.org/schemas/v1/AutomationNode.json#/definitions/AutomationNode"
+                    },
+                    "longDescription": "This property shall contain an array of links to resources of type `AutomationNode` with which this physical container is associated.",
+                    "readonly": true,
+                    "type": "array",
+                    "versionAdded": "v1_27_0"
+                },
+                "AutomationNodes@odata.count": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
+                },
                 "Cables": {
                     "description": "An array of links to the cables connected to this chassis.",
                     "items": {
@@ -1308,6 +1321,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2024.4",
-    "title": "#Chassis.v1_26_0.Chassis"
+    "release": "2025.2",
+    "title": "#Chassis.v1_27_0.Chassis"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/ComputerSystem.v1_24_0.json b/redfish-core/schema/dmtf/json-schema/ComputerSystem.v1_25_0.json
similarity index 98%
rename from redfish-core/schema/dmtf/json-schema/ComputerSystem.v1_24_0.json
rename to redfish-core/schema/dmtf/json-schema/ComputerSystem.v1_25_0.json
index d7e69b4..2b37ba9 100644
--- a/redfish-core/schema/dmtf/json-schema/ComputerSystem.v1_24_0.json
+++ b/redfish-core/schema/dmtf/json-schema/ComputerSystem.v1_25_0.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/ComputerSystem.v1_24_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/ComputerSystem.v1_25_0.json",
     "$ref": "#/definitions/ComputerSystem",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2025 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -703,6 +703,12 @@
                     "type": "array",
                     "versionAdded": "v1_2_0"
                 },
+                "IPMIHostInterface": {
+                    "$ref": "#/definitions/IPMIHostInterface",
+                    "description": "The information about the in-band IPMI service of this system.",
+                    "longDescription": "This property shall contain the information about the in-band IPMI service of this system.",
+                    "versionAdded": "v1_25_0"
+                },
                 "Id": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Id",
                     "readonly": true
@@ -1384,6 +1390,35 @@
             },
             "type": "string"
         },
+        "IPMIHostInterface": {
+            "additionalProperties": false,
+            "description": "The information about the in-band IPMI service for this system.",
+            "longDescription": "This type shall describe the in-band IPMI service for a computer system.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "ServiceEnabled": {
+                    "description": "An indication of whether the service is enabled for this system.",
+                    "longDescription": "This property shall indicate whether the protocol for the service is enabled.",
+                    "readonly": false,
+                    "type": "boolean",
+                    "versionAdded": "v1_25_0"
+                }
+            },
+            "type": "object"
+        },
         "IdlePowerSaver": {
             "additionalProperties": false,
             "description": "The idle power saver settings of a computer system.",
@@ -2621,6 +2656,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2025.1",
-    "title": "#ComputerSystem.v1_24_0.ComputerSystem"
+    "release": "2025.2",
+    "title": "#ComputerSystem.v1_25_0.ComputerSystem"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/ConnectionMethod.v1_1_1.json b/redfish-core/schema/dmtf/json-schema/ConnectionMethod.v1_2_0.json
similarity index 90%
rename from redfish-core/schema/dmtf/json-schema/ConnectionMethod.v1_1_1.json
rename to redfish-core/schema/dmtf/json-schema/ConnectionMethod.v1_2_0.json
index b46669a..abae58c 100644
--- a/redfish-core/schema/dmtf/json-schema/ConnectionMethod.v1_1_1.json
+++ b/redfish-core/schema/dmtf/json-schema/ConnectionMethod.v1_2_0.json
@@ -1,8 +1,8 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/ConnectionMethod.v1_1_1.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/ConnectionMethod.v1_2_0.json",
     "$ref": "#/definitions/ConnectionMethod",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
-    "copyright": "Copyright 2014-2024 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
+    "copyright": "Copyright 2014-2025 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
     "definitions": {
         "Actions": {
             "additionalProperties": false,
@@ -148,11 +148,15 @@
                 "IPMI15",
                 "IPMI20",
                 "NETCONF",
-                "OEM"
+                "OEM",
+                "ModbusSerial",
+                "ModbusTCP"
             ],
             "enumDescriptions": {
                 "IPMI15": "IPMI 1.5 connection method.",
                 "IPMI20": "IPMI 2.0 connection method.",
+                "ModbusSerial": "Modbus serial connection method.",
+                "ModbusTCP": "Modbus TCP connection method.",
                 "NETCONF": "NETCONF connection method.",
                 "OEM": "OEM connection method.",
                 "Redfish": "Redfish connection method.",
@@ -161,11 +165,17 @@
             "enumLongDescriptions": {
                 "IPMI15": "This value shall indicate the connection method is IPMI 1.5.",
                 "IPMI20": "This value shall indicate the connection method is IPMI 2.0.",
+                "ModbusSerial": "This value shall indicate the connection method is Modbus serial (RTU).",
+                "ModbusTCP": "This value shall indicate the connection method is Modbus TCP.",
                 "NETCONF": "This value shall indicate the connection method is NETCONF.",
                 "OEM": "This value shall indicate the connection method is OEM.  The `ConnectionMethodVariant` property shall contain further identification information.",
                 "Redfish": "This value shall indicate the connection method is Redfish.",
                 "SNMP": "This value shall indicate the connection method is SNMP."
             },
+            "enumVersionAdded": {
+                "ModbusSerial": "v1_2_0",
+                "ModbusTCP": "v1_2_0"
+            },
             "type": "string"
         },
         "Links": {
@@ -203,6 +213,13 @@
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Oem",
                     "description": "The OEM extension property.",
                     "longDescription": "This property shall contain the OEM extensions.  All values for properties contained in this object shall conform to the Redfish Specification-described requirements."
+                },
+                "SerialInterface": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/SerialInterface.json#/definitions/SerialInterface",
+                    "description": "The link to the serial interface for this connection method.",
+                    "longDescription": "This property shall contain a link to a resource of type `SerialInterface` that represents the serial interface for this connection method.",
+                    "readonly": true,
+                    "versionAdded": "v1_2_0"
                 }
             },
             "type": "object"
@@ -246,6 +263,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2022.3",
-    "title": "#ConnectionMethod.v1_1_1.ConnectionMethod"
+    "release": "2025.2",
+    "title": "#ConnectionMethod.v1_2_0.ConnectionMethod"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/Control.v1_6_0.json b/redfish-core/schema/dmtf/json-schema/Control.v1_7_0.json
similarity index 85%
rename from redfish-core/schema/dmtf/json-schema/Control.v1_6_0.json
rename to redfish-core/schema/dmtf/json-schema/Control.v1_7_0.json
index 8e4eeb5..97f3a13 100644
--- a/redfish-core/schema/dmtf/json-schema/Control.v1_6_0.json
+++ b/redfish-core/schema/dmtf/json-schema/Control.v1_7_0.json
@@ -1,8 +1,8 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Control.v1_6_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Control.v1_7_0.json",
     "$ref": "#/definitions/Control",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
-    "copyright": "Copyright 2014-2024 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
+    "copyright": "Copyright 2014-2025 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
     "definitions": {
         "Actions": {
             "additionalProperties": false,
@@ -293,7 +293,7 @@
                 },
                 "SetPoint": {
                     "description": "The desired set point of the control.",
-                    "excerpt": "ControlSingle,ControlSingleLoop",
+                    "excerpt": "ControlSingle,ControlSingleLoop,ControlNode",
                     "longDescription": "This property shall contain the desired set point control value.  The units shall follow the value of `SetPointUnits`.  If the `DefaultSetPoint` property is not supported and if a user-defined set point is not configured, the property may contain `null` in responses.",
                     "readonly": false,
                     "type": [
@@ -311,6 +311,16 @@
                     ],
                     "versionAdded": "v1_4_0"
                 },
+                "SetPointError": {
+                    "description": "The error (difference) from the desired set point of the control.",
+                    "longDescription": "This property shall contain the error, or difference, of the related Sensor `Reading` value from the value of the `SetPoint`.  The units shall follow the value of `SetPointUnits`.",
+                    "readonly": true,
+                    "type": [
+                        "number",
+                        "null"
+                    ],
+                    "versionAdded": "v1_7_0"
+                },
                 "SetPointType": {
                     "anyOf": [
                         {
@@ -326,6 +336,7 @@
                 },
                 "SetPointUnits": {
                     "description": "The units of the set point and related properties in UCUM c/s format.",
+                    "excerpt": "ControlNode",
                     "longDescription": "This property shall contain the units of the control's set point and related properties.  The value shall follow the case-sensitive symbol format defined by the Unified Code for Units of Measure (UCUM), as specified by the 'Units of measure annotation' clause of the Redfish Specification.",
                     "readonly": true,
                     "type": [
@@ -451,16 +462,6 @@
                         "number",
                         "null"
                     ]
-                },
-                "ReadingUnits": {
-                    "description": "The units of the sensor reading associated with this control.",
-                    "excerptCopyOnly": true,
-                    "longDescription": "This property shall contain the units of the sensor's reading and thresholds.  This property shall not be present if multiple sensors are associated with a single control.",
-                    "readonly": true,
-                    "type": [
-                        "string",
-                        "null"
-                    ]
                 }
             },
             "type": "object"
@@ -542,6 +543,115 @@
             },
             "type": "string"
         },
+        "ControlNodeExcerpt": {
+            "additionalProperties": false,
+            "description": "The `Control` schema describes a control point and its properties.",
+            "excerpt": "ControlNode",
+            "longDescription": "This resource shall represent a control point for a Redfish implementation.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "AllowableMax": {
+                    "description": "The maximum possible setting for this control.",
+                    "excerpt": "Control",
+                    "longDescription": "This property shall indicate the maximum possible value of the `SetPoint` or `SettingMax` properties for this control.  Services shall not accept values for `SetPoint` or `SettingMax` above this value.",
+                    "readonly": true,
+                    "type": [
+                        "number",
+                        "null"
+                    ]
+                },
+                "AllowableMin": {
+                    "description": "The minimum possible setting for this control.",
+                    "excerpt": "Control",
+                    "longDescription": "This property shall indicate the minimum possible value of the `SetPoint` or `SettingMin` properties for this control.  Services shall not accept values for `SetPoint` or `SettingMin` below this value.",
+                    "readonly": true,
+                    "type": [
+                        "number",
+                        "null"
+                    ]
+                },
+                "ControlMode": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/ControlMode"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The current operating mode of the control.",
+                    "excerpt": "Control",
+                    "longDescription": "This property shall contain the operating mode of the control.",
+                    "readonly": false
+                },
+                "DataSourceUri": {
+                    "description": "The link to the resource that provides the data for this control.",
+                    "excerptCopyOnly": true,
+                    "format": "uri-reference",
+                    "longDescription": "This property shall contain a URI to the resource that provides the source of the excerpt contained within this copy.  If no source resource is implemented, meaning the excerpt represents the only available data, this property shall not be present.",
+                    "readonly": true,
+                    "type": [
+                        "string",
+                        "null"
+                    ]
+                },
+                "Reading": {
+                    "description": "The reading of the sensor associated with this control.",
+                    "excerptCopyOnly": true,
+                    "longDescription": "This property shall contain the value of the `Reading` property of the `Sensor` resource directly associated with this control.  This property shall not be present if multiple sensors are associated with a single control.",
+                    "readonly": true,
+                    "type": [
+                        "number",
+                        "null"
+                    ]
+                },
+                "ReadingUnits": {
+                    "description": "The units of the sensor reading associated with this control.",
+                    "excerpt": "ControlNode",
+                    "excerptCopyOnly": true,
+                    "longDescription": "This property shall contain the units of the sensor's reading and thresholds.  This property shall not be present if multiple sensors are associated with a single control.",
+                    "readonly": true,
+                    "type": [
+                        "string",
+                        "null"
+                    ]
+                },
+                "SetPoint": {
+                    "description": "The desired set point of the control.",
+                    "excerpt": "ControlSingle,ControlSingleLoop,ControlNode",
+                    "longDescription": "This property shall contain the desired set point control value.  The units shall follow the value of `SetPointUnits`.  If the `DefaultSetPoint` property is not supported and if a user-defined set point is not configured, the property may contain `null` in responses.",
+                    "readonly": false,
+                    "type": [
+                        "number",
+                        "null"
+                    ]
+                },
+                "SetPointUnits": {
+                    "description": "The units of the set point and related properties in UCUM c/s format.",
+                    "excerpt": "ControlNode",
+                    "longDescription": "This property shall contain the units of the control's set point and related properties.  The value shall follow the case-sensitive symbol format defined by the Unified Code for Units of Measure (UCUM), as specified by the 'Units of measure annotation' clause of the Redfish Specification.",
+                    "readonly": true,
+                    "type": [
+                        "string",
+                        "null"
+                    ]
+                }
+            },
+            "type": "object"
+        },
         "ControlRangeExcerpt": {
             "additionalProperties": false,
             "description": "The `Control` schema describes a control point and its properties.",
@@ -630,16 +740,6 @@
                         "null"
                     ]
                 },
-                "ReadingUnits": {
-                    "description": "The units of the sensor reading associated with this control.",
-                    "excerptCopyOnly": true,
-                    "longDescription": "This property shall contain the units of the sensor's reading and thresholds.  This property shall not be present if multiple sensors are associated with a single control.",
-                    "readonly": true,
-                    "type": [
-                        "string",
-                        "null"
-                    ]
-                },
                 "SettingMax": {
                     "description": "The maximum set point in the allowed range.",
                     "excerpt": "ControlRange",
@@ -749,19 +849,9 @@
                         "null"
                     ]
                 },
-                "ReadingUnits": {
-                    "description": "The units of the sensor reading associated with this control.",
-                    "excerptCopyOnly": true,
-                    "longDescription": "This property shall contain the units of the sensor's reading and thresholds.  This property shall not be present if multiple sensors are associated with a single control.",
-                    "readonly": true,
-                    "type": [
-                        "string",
-                        "null"
-                    ]
-                },
                 "SetPoint": {
                     "description": "The desired set point of the control.",
-                    "excerpt": "ControlSingle,ControlSingleLoop",
+                    "excerpt": "ControlSingle,ControlSingleLoop,ControlNode",
                     "longDescription": "This property shall contain the desired set point control value.  The units shall follow the value of `SetPointUnits`.  If the `DefaultSetPoint` property is not supported and if a user-defined set point is not configured, the property may contain `null` in responses.",
                     "readonly": false,
                     "type": [
@@ -853,19 +943,9 @@
                         "null"
                     ]
                 },
-                "ReadingUnits": {
-                    "description": "The units of the sensor reading associated with this control.",
-                    "excerptCopyOnly": true,
-                    "longDescription": "This property shall contain the units of the sensor's reading and thresholds.  This property shall not be present if multiple sensors are associated with a single control.",
-                    "readonly": true,
-                    "type": [
-                        "string",
-                        "null"
-                    ]
-                },
                 "SetPoint": {
                     "description": "The desired set point of the control.",
-                    "excerpt": "ControlSingle,ControlSingleLoop",
+                    "excerpt": "ControlSingle,ControlSingleLoop,ControlNode",
                     "longDescription": "This property shall contain the desired set point control value.  The units shall follow the value of `SetPointUnits`.  If the `DefaultSetPoint` property is not supported and if a user-defined set point is not configured, the property may contain `null` in responses.",
                     "readonly": false,
                     "type": [
@@ -887,6 +967,12 @@
                 "Valve",
                 "Percent",
                 "DutyCycle",
+                "LinearPosition",
+                "LinearVelocity",
+                "LinearAcceleration",
+                "RotationalPosition",
+                "RotationalVelocity",
+                "RotationalAcceleration",
                 "LiquidFlowLPM"
             ],
             "enumDeprecated": {
@@ -896,11 +982,17 @@
                 "DutyCycle": "Duty cycle (%) control.",
                 "Frequency": "Frequency (Hz) control.",
                 "FrequencyMHz": "Frequency (MHz) control.",
+                "LinearAcceleration": "Linear acceleration (m/s^2) control.",
+                "LinearPosition": "Linear position or distance (m) control.",
+                "LinearVelocity": "Linear velocity (m/s) control.",
                 "LiquidFlowLPM": "Liquid flow (L/min) control.",
                 "Percent": "Percent-based control.",
                 "Power": "Power (W) control or power limit.",
                 "Pressure": "Pressure (kPa) control.",
                 "PressurekPa": "Pressure (kPa) control.",
+                "RotationalAcceleration": "Rotational acceleration (rad/s^2) control.",
+                "RotationalPosition": "Rotational position (rad) control.",
+                "RotationalVelocity": "Rotational velocity (rad/s) control.",
                 "Temperature": "Temperature (C) control or thermostat.",
                 "Valve": "Valve (% open) control."
             },
@@ -908,21 +1000,33 @@
                 "DutyCycle": "This value shall indicate a control used to adjust the duty cycle, such as a PWM-based control, in percent units.  The `SetPointUnits` property shall contain `%`.",
                 "Frequency": "This value shall indicate a control used to limit the operating frequency, in hertz units, of a device, either to a single set point or within a range.  The `SetPointUnits` property shall contain `Hz`.",
                 "FrequencyMHz": "This value shall indicate a control used to limit the operating frequency, in megahertz units, of a device, either to a single set point or within a range.  The `SetPointUnits` property shall contain `MHz`.",
+                "LinearAcceleration": "This value shall indicate a control used to adjust linear acceleration, in meters per square second units.  The `SetPointUnits` property shall contain `m/s2`.",
+                "LinearPosition": "This value shall indicate a control used to adjust linear position or distance, in meter units.  The `SetPointUnits` property shall contain `m`.",
+                "LinearVelocity": "This value shall indicate a control used to adjust linear velocity, in meters per second units.  The `SetPointUnits` property shall contain `m/s`.",
                 "LiquidFlowLPM": "This value shall indicate a control used to adjust the volume of liquid per unit of time, in liters per minute units, that flows through a particular junction.  The `SetPointUnits` property shall contain `L/min`.",
                 "Percent": "This value shall indicate a percent-based control, in percent units.  The `SetPointUnits` property shall contain `%`.",
                 "Power": "This value shall indicate a control used to regulate or limit maximum power consumption, in watt units, either to a single set point or within a range.  The `SetPointUnits` property shall contain `W`.",
                 "Pressure": "This value shall indicate a control used to adjust pressure in a system, in kilopascal units.  The `SetPointUnits` property shall contain `kPa`.",
                 "PressurekPa": "This value shall indicate a control used to adjust pressure in a system, in kilopascal units.  The `SetPointUnits` property shall contain `kPa`.",
+                "RotationalAcceleration": "This value shall indicate a control used to adjust rotational acceleration, in radians per square second units.  The `SetPointUnits` property shall contain `rad/s2`.",
+                "RotationalPosition": "This value shall indicate a control used to adjust rotational position, in radian units.  The `SetPointUnits` property shall contain `rad`.",
+                "RotationalVelocity": "This value shall indicate a control used to adjust rotational velocity, in radians per second units.  The `SetPointUnits` property shall contain `rad/s`.",
                 "Temperature": "This value shall indicate a control used to regulate temperature, in degree Celsius units, either to a single set point or within a range.  The `SetPointUnits` property shall contain `Cel`.",
                 "Valve": "This value shall indicate a control used to adjust a valve in a system, in percent units.  The `SetPointUnits` property shall contain `%`.  A value of `100` shall indicate the valve is completely open, and a value of `0` shall indicate the valve is completely closed."
             },
             "enumVersionAdded": {
                 "DutyCycle": "v1_5_0",
                 "FrequencyMHz": "v1_1_0",
+                "LinearAcceleration": "v1_6_0",
+                "LinearPosition": "v1_6_0",
+                "LinearVelocity": "v1_6_0",
                 "LiquidFlowLPM": "v1_6_0",
                 "Percent": "v1_5_0",
                 "Pressure": "v1_1_0",
                 "PressurekPa": "v1_3_0",
+                "RotationalAcceleration": "v1_6_0",
+                "RotationalPosition": "v1_6_0",
+                "RotationalVelocity": "v1_6_0",
                 "Valve": "v1_3_0"
             },
             "enumVersionDeprecated": {
@@ -1000,21 +1104,27 @@
         "SetPointType": {
             "enum": [
                 "Single",
-                "Range"
+                "Range",
+                "Monitor"
             ],
             "enumDescriptions": {
+                "Monitor": "Control only monitors a reading.",
                 "Range": "Control uses a range of values.",
                 "Single": "Control uses a single set point."
             },
             "enumLongDescriptions": {
+                "Monitor": "This value shall indicate the control provides only monitoring of a sensor reading, and does not provide the ability to affect the reading.  This value allows for multiple controls to be populated while only some of those controls provide a set point.  The `SetPoint,`SettingMin` and `SettingMax` properties shall not be present for this control type.  For example, a motion controller may provide both position-based and velocity-based control modes, where the selected mode provides the `SetPoint`, and the control for the non-selected mode provides only a sensor reading.",
                 "Range": "This value shall indicate the control utilizes a set point range for its operation.  The `SettingMin` and `SettingMax` properties shall be present for this control type.  The `SetPoint` property shall not be present for this control type.",
                 "Single": "This value shall indicate the control utilizes a single set point for its operation.  The `SetPoint` property shall be present for this control type.  The `SettingMin` and `SettingMax` properties shall not be present for this control type."
             },
+            "enumVersionAdded": {
+                "Monitor": "v1_6_0"
+            },
             "type": "string"
         }
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2024.4",
-    "title": "#Control.v1_6_0.Control"
+    "release": "2025.2",
+    "title": "#Control.v1_7_0.Control"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/CoolantConnector.v1_1_0.json b/redfish-core/schema/dmtf/json-schema/CoolantConnector.v1_2_0.json
similarity index 92%
rename from redfish-core/schema/dmtf/json-schema/CoolantConnector.v1_1_0.json
rename to redfish-core/schema/dmtf/json-schema/CoolantConnector.v1_2_0.json
index 55f5dcc..b5123f0 100644
--- a/redfish-core/schema/dmtf/json-schema/CoolantConnector.v1_1_0.json
+++ b/redfish-core/schema/dmtf/json-schema/CoolantConnector.v1_2_0.json
@@ -1,8 +1,8 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/CoolantConnector.v1_1_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/CoolantConnector.v1_2_0.json",
     "$ref": "#/definitions/CoolantConnector",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
-    "copyright": "Copyright 2014-2024 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
+    "copyright": "Copyright 2014-2025 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
     "definitions": {
         "Actions": {
             "additionalProperties": false,
@@ -290,6 +290,20 @@
                     "longDescription": "This property shall contain the pressure, in kilopascal units, for the outflow or return connection to the cooling loop.  The value of the `DataSourceUri` property, if present, shall reference a resource of type `Sensor` with the `ReadingType` property containing the value `PressurekPa`.",
                     "readonly": true
                 },
+                "ReturnTemperatureCelsius": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Sensor.json#/definitions/SensorExcerpt"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The return temperature (C).",
+                    "excerptCopy": "SensorExcerpt",
+                    "longDescription": "This property shall contain the temperature, in degree Celsius units, for the outflow or return connection to the cooling loop.  The value of the `DataSourceUri` property, if present, shall reference a resource of type `Sensor` with the `ReadingType` property containing the value `Temperature`.",
+                    "readonly": true
+                },
                 "ReturnTemperatureControlCelsius": {
                     "anyOf": [
                         {
@@ -305,20 +319,6 @@
                     "readonly": true,
                     "versionAdded": "v1_1_0"
                 },
-                "ReturnTemperatureCelsius": {
-                    "anyOf": [
-                        {
-                            "$ref": "http://redfish.dmtf.org/schemas/v1/Sensor.json#/definitions/SensorExcerpt"
-                        },
-                        {
-                            "type": "null"
-                        }
-                    ],
-                    "description": "The return temperature (C).",
-                    "excerptCopy": "SensorExcerpt",
-                    "longDescription": "This property shall contain the temperature, in degree Celsius units, for the outflow or return connection to the cooling loop.  The value of the `DataSourceUri` property, if present, shall reference a resource of type `Sensor` with the `ReadingType` property containing the value `Temperature`.",
-                    "readonly": true
-                },
                 "Status": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Status",
                     "description": "The status and health of the resource and its subordinate or dependent resources.",
@@ -366,6 +366,36 @@
                     "longDescription": "This property shall contain the desired supply temperature, in degree Celsius units, of this coolant connector.  The value of the `DataSourceUri` property, if present, shall reference a resource of type `Control` with the `ControlType` property containing the value `Temperature`.  This property shall only be present for secondary coolant connectors.  Services may automatically change other controls if a client attempts to enable this control to prevent conflicts.",
                     "readonly": true,
                     "versionAdded": "v1_1_0"
+                },
+                "ValvePositionControlPercent": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Control.json#/definitions/ControlSingleLoopExcerpt"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The desired valve position (% open).",
+                    "excerptCopy": "ControlSingleLoopExcerpt",
+                    "longDescription": "This property shall contain the desired valve position, in percent units, of this coolant connector.  The value of the `DataSourceUri` property, if present, shall reference a resource of type `Control` with the `ControlType` property containing the value `Valve`.  Services may automatically change other controls if a client attempts to enable this control to prevent conflicts.",
+                    "readonly": true,
+                    "versionAdded": "v1_2_0"
+                },
+                "ValvePositionPercent": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Sensor.json#/definitions/SensorExcerpt"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The valve position (% open) of this connector.",
+                    "excerptCopy": "SensorExcerpt",
+                    "longDescription": "This property shall contain the valve position, in percent units, of this connector.  The value of the `DataSourceUri` property, if present, shall reference a resource of type `Sensor` with the `ReadingType` property containing the value `Valve`.",
+                    "readonly": true,
+                    "versionAdded": "v1_2_0"
                 }
             },
             "required": [
@@ -482,6 +512,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2024.4",
-    "title": "#CoolantConnector.v1_1_0.CoolantConnector"
+    "release": "2025.2",
+    "title": "#CoolantConnector.v1_2_0.CoolantConnector"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/CoolantConnectorCollection.json b/redfish-core/schema/dmtf/json-schema/CoolantConnectorCollection.json
index 6d2cfc0..8098199 100644
--- a/redfish-core/schema/dmtf/json-schema/CoolantConnectorCollection.json
+++ b/redfish-core/schema/dmtf/json-schema/CoolantConnectorCollection.json
@@ -98,7 +98,8 @@
                 "/redfish/v1/ThermalEquipment/ImmersionUnits/{CoolingUnitId}/PrimaryCoolantConnectors",
                 "/redfish/v1/ThermalEquipment/ImmersionUnits/{CoolingUnitId}/SecondaryCoolantConnectors",
                 "/redfish/v1/ThermalEquipment/HeatExchangers/{CoolingUnitId}/PrimaryCoolantConnectors",
-                "/redfish/v1/ThermalEquipment/HeatExchangers/{CoolingUnitId}/SecondaryCoolantConnectors"
+                "/redfish/v1/ThermalEquipment/HeatExchangers/{CoolingUnitId}/SecondaryCoolantConnectors",
+                "/redfish/v1/ThermalEquipment/RPUs/{CoolingUnitId}/PrimaryCoolantConnectors"
             ]
         }
     },
diff --git a/redfish-core/schema/dmtf/json-schema/CoolingUnit.v1_2_0.json b/redfish-core/schema/dmtf/json-schema/CoolingUnit.v1_3_0.json
similarity index 97%
rename from redfish-core/schema/dmtf/json-schema/CoolingUnit.v1_2_0.json
rename to redfish-core/schema/dmtf/json-schema/CoolingUnit.v1_3_0.json
index 492cb09..b2f4b3e 100644
--- a/redfish-core/schema/dmtf/json-schema/CoolingUnit.v1_2_0.json
+++ b/redfish-core/schema/dmtf/json-schema/CoolingUnit.v1_3_0.json
@@ -1,8 +1,8 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/CoolingUnit.v1_2_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/CoolingUnit.v1_3_0.json",
     "$ref": "#/definitions/CoolingUnit",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
-    "copyright": "Copyright 2014-2024 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
+    "copyright": "Copyright 2014-2025 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
     "definitions": {
         "Actions": {
             "additionalProperties": false,
@@ -38,12 +38,17 @@
             "enum": [
                 "CDU",
                 "HeatExchanger",
-                "ImmersionUnit"
+                "ImmersionUnit",
+                "RPU"
             ],
             "enumDescriptions": {
                 "CDU": "A coolant distribution unit (CDU).",
                 "HeatExchanger": "A heat exchanger.",
-                "ImmersionUnit": "An immersion cooling unit."
+                "ImmersionUnit": "An immersion cooling unit.",
+                "RPU": "A reservoir and pumping unit (RPU)."
+            },
+            "enumVersionAdded": {
+                "RPU": "v1_3_0"
             },
             "type": "string"
         },
@@ -436,6 +441,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2024.4",
-    "title": "#CoolingUnit.v1_2_0.CoolingUnit"
+    "release": "2025.2",
+    "title": "#CoolingUnit.v1_3_0.CoolingUnit"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/CoolingUnitCollection.json b/redfish-core/schema/dmtf/json-schema/CoolingUnitCollection.json
index 04c46a6..5c4fe07 100644
--- a/redfish-core/schema/dmtf/json-schema/CoolingUnitCollection.json
+++ b/redfish-core/schema/dmtf/json-schema/CoolingUnitCollection.json
@@ -92,7 +92,8 @@
             "uris": [
                 "/redfish/v1/ThermalEquipment/CDUs",
                 "/redfish/v1/ThermalEquipment/ImmersionUnits",
-                "/redfish/v1/ThermalEquipment/HeatExchangers"
+                "/redfish/v1/ThermalEquipment/HeatExchangers",
+                "/redfish/v1/ThermalEquipment/RPUs"
             ]
         }
     },
diff --git a/redfish-core/schema/dmtf/json-schema/EnvironmentMetrics.v1_4_0.json b/redfish-core/schema/dmtf/json-schema/EnvironmentMetrics.v1_5_0.json
similarity index 90%
rename from redfish-core/schema/dmtf/json-schema/EnvironmentMetrics.v1_4_0.json
rename to redfish-core/schema/dmtf/json-schema/EnvironmentMetrics.v1_5_0.json
index 83882fa..03a94e5 100644
--- a/redfish-core/schema/dmtf/json-schema/EnvironmentMetrics.v1_4_0.json
+++ b/redfish-core/schema/dmtf/json-schema/EnvironmentMetrics.v1_5_0.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/EnvironmentMetrics.v1_4_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/EnvironmentMetrics.v1_5_0.json",
     "$ref": "#/definitions/EnvironmentMetrics",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2025 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -101,6 +101,20 @@
                     "longDescription": "This property shall contain the ambient temperature, in degree Celsius units, for this resource.  The ambient temperature shall be the temperature measured at a point exterior to the `Chassis` containing this resource.  The value of the `DataSourceUri` property, if present, shall reference a resource of type `Sensor` with the `ReadingType` property containing the value `Temperature`.  This property shall only be present, if supported, in resource instances subordinate to a `Chassis` or `CoolingUnit` resource.",
                     "versionAdded": "v1_4_0"
                 },
+                "CurrentAmps": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Sensor.json#/definitions/SensorCurrentExcerpt"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The current (A) for this device.",
+                    "excerptCopy": "SensorCurrentExcerpt",
+                    "longDescription": "This property shall contain the current, in ampere units, for this device.  The value of the `DataSourceUri` property, if present, shall reference a resource of type `Sensor` with the `ReadingType` property containing the value `Current`.",
+                    "versionAdded": "v1_5_0"
+                },
                 "Description": {
                     "anyOf": [
                         {
@@ -245,6 +259,20 @@
                     "description": "Temperature (Celsius).",
                     "excerptCopy": "SensorExcerpt",
                     "longDescription": "This property shall contain the temperature, in degree Celsius units, for this resource.  The value of the `DataSourceUri` property, if present, shall reference a resource of type `Sensor` with the `ReadingType` property containing the value `Temperature`."
+                },
+                "Voltage": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Sensor.json#/definitions/SensorVoltageExcerpt"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The voltage (V) for this device.",
+                    "excerptCopy": "SensorVoltageExcerpt",
+                    "longDescription": "This property shall contain the voltage, in volt units, for this device.  The value of the `DataSourceUri` property, if present, shall reference a resource of type `Sensor` with the `ReadingType` property containing the value `Voltage`.",
+                    "versionAdded": "v1_5_0"
                 }
             },
             "required": [
@@ -344,6 +372,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2025.1",
-    "title": "#EnvironmentMetrics.v1_4_0.EnvironmentMetrics"
+    "release": "2025.2",
+    "title": "#EnvironmentMetrics.v1_5_0.EnvironmentMetrics"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/Fabric.v1_3_2.json b/redfish-core/schema/dmtf/json-schema/Fabric.v1_4_0.json
similarity index 92%
rename from redfish-core/schema/dmtf/json-schema/Fabric.v1_3_2.json
rename to redfish-core/schema/dmtf/json-schema/Fabric.v1_4_0.json
index 5725ef1..a5be224 100644
--- a/redfish-core/schema/dmtf/json-schema/Fabric.v1_3_2.json
+++ b/redfish-core/schema/dmtf/json-schema/Fabric.v1_4_0.json
@@ -1,8 +1,8 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Fabric.v1_3_2.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Fabric.v1_4_0.json",
     "$ref": "#/definitions/Fabric",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
-    "copyright": "Copyright 2014-2024 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
+    "copyright": "Copyright 2014-2025 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
     "definitions": {
         "Actions": {
             "additionalProperties": false,
@@ -204,6 +204,19 @@
                 }
             },
             "properties": {
+                "ManagedBy": {
+                    "description": "An array of links to the managers responsible for managing this fabric.",
+                    "items": {
+                        "$ref": "http://redfish.dmtf.org/schemas/v1/Manager.json#/definitions/Manager"
+                    },
+                    "longDescription": "This property shall contain an array of links to resources of type `Manager` that represent the managers responsible for managing this fabric.",
+                    "readonly": true,
+                    "type": "array",
+                    "versionAdded": "v1_4_0"
+                },
+                "ManagedBy@odata.count": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
+                },
                 "Oem": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Oem",
                     "description": "The OEM extension property.",
@@ -236,6 +249,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2022.1",
-    "title": "#Fabric.v1_3_2.Fabric"
+    "release": "2025.2",
+    "title": "#Fabric.v1_4_0.Fabric"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/Filter.v1_0_2.json b/redfish-core/schema/dmtf/json-schema/Filter.v1_1_0.json
similarity index 90%
rename from redfish-core/schema/dmtf/json-schema/Filter.v1_0_2.json
rename to redfish-core/schema/dmtf/json-schema/Filter.v1_1_0.json
index 11a52d6..af64ec1 100644
--- a/redfish-core/schema/dmtf/json-schema/Filter.v1_0_2.json
+++ b/redfish-core/schema/dmtf/json-schema/Filter.v1_1_0.json
@@ -1,8 +1,8 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Filter.v1_0_2.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Filter.v1_1_0.json",
     "$ref": "#/definitions/Filter",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
-    "copyright": "Copyright 2014-2024 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
+    "copyright": "Copyright 2014-2025 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
     "definitions": {
         "Actions": {
             "additionalProperties": false,
@@ -73,6 +73,21 @@
                     "longDescription": "This property shall contain a link to a resource of type `Assembly`.",
                     "readonly": true
                 },
+                "DeltaLiquidPressurekPa": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Sensor.json#/definitions/SensorExcerpt"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The differential pressure (kPa) across the liquid filter.",
+                    "excerptCopy": "SensorExcerpt",
+                    "longDescription": "This property shall contain the pressure, in kilopascal units, for the difference in pressure between the intake and outflow connections on the filter.  The value of the `DataSourceUri` property, if present, shall reference a resource of type `Sensor` with the `ReadingType` property containing the value `PressurekPa`.",
+                    "readonly": true,
+                    "versionAdded": "v1_1_0"
+                },
                 "Description": {
                     "anyOf": [
                         {
@@ -182,7 +197,7 @@
                 },
                 "ServiceHours": {
                     "description": "The hours of service this filter has provided.",
-                    "longDescription": "This property shall contain the number of hours of service that the filter or filter media has provided.",
+                    "longDescription": "This property shall contain the number of hours of service that the filter or filter media has provided.  The service may reset or update the value in response to an update of `ServicedDate`.",
                     "readonly": false,
                     "type": [
                         "number",
@@ -192,7 +207,7 @@
                 "ServicedDate": {
                     "description": "The date this filter was put into service.",
                     "format": "date-time",
-                    "longDescription": "This property shall contain the date the filter or filter media was put into active service.",
+                    "longDescription": "This property shall contain the date the filter or filter media was put into active service.  The service may update the value in response to an update of `ServiceHours`.",
                     "readonly": false,
                     "type": [
                         "string",
@@ -252,6 +267,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2023.1",
-    "title": "#Filter.v1_0_2.Filter"
+    "release": "2025.2",
+    "title": "#Filter.v1_1_0.Filter"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/FilterCollection.json b/redfish-core/schema/dmtf/json-schema/FilterCollection.json
index 07ad31b..99bae4f 100644
--- a/redfish-core/schema/dmtf/json-schema/FilterCollection.json
+++ b/redfish-core/schema/dmtf/json-schema/FilterCollection.json
@@ -90,6 +90,7 @@
             "insertable": false,
             "updatable": false,
             "uris": [
+                "/redfish/v1/Chassis/{ChassisId}/ThermalSubsystem/Filters",
                 "/redfish/v1/Chassis/{ChassisId}/ThermalSubsystem/Pumps/{PumpId}/Filters",
                 "/redfish/v1/ThermalEquipment/CDUs/{CoolingUnitId}/Filters",
                 "/redfish/v1/ThermalEquipment/CDUs/{CoolingUnitId}/Reservoirs/{ReservoirId}/Filters",
@@ -99,7 +100,10 @@
                 "/redfish/v1/ThermalEquipment/ImmersionUnits/{CoolingUnitId}/Pumps/{PumpId}/Filters",
                 "/redfish/v1/ThermalEquipment/HeatExchangers/{CoolingUnitId}/Filters",
                 "/redfish/v1/ThermalEquipment/HeatExchangers/{CoolingUnitId}/Reservoirs/{ReservoirId}/Filters",
-                "/redfish/v1/ThermalEquipment/HeatExchangers/{CoolingUnitId}/Pumps/{PumpId}/Filters"
+                "/redfish/v1/ThermalEquipment/HeatExchangers/{CoolingUnitId}/Pumps/{PumpId}/Filters",
+                "/redfish/v1/ThermalEquipment/RPUs/{CoolingUnitId}/Filters",
+                "/redfish/v1/ThermalEquipment/RPUs/{CoolingUnitId}/Reservoirs/{ReservoirId}/Filters",
+                "/redfish/v1/ThermalEquipment/RPUs/{CoolingUnitId}/Pumps/{PumpId}/Filters"
             ]
         }
     },
diff --git a/redfish-core/schema/dmtf/json-schema/Job.v1_2_4.json b/redfish-core/schema/dmtf/json-schema/Job.v1_2_4.json
deleted file mode 100644
index 80efbdb..0000000
--- a/redfish-core/schema/dmtf/json-schema/Job.v1_2_4.json
+++ /dev/null
@@ -1,376 +0,0 @@
-{
-    "$id": "http://redfish.dmtf.org/schemas/v1/Job.v1_2_4.json",
-    "$ref": "#/definitions/Job",
-    "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
-    "copyright": "Copyright 2014-2024 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
-    "definitions": {
-        "Actions": {
-            "additionalProperties": false,
-            "description": "The available actions for this resource.",
-            "longDescription": "This type shall contain the available actions for this resource.",
-            "patternProperties": {
-                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
-                    "description": "This property shall specify a valid odata or Redfish property.",
-                    "type": [
-                        "array",
-                        "boolean",
-                        "integer",
-                        "number",
-                        "null",
-                        "object",
-                        "string"
-                    ]
-                }
-            },
-            "properties": {
-                "Oem": {
-                    "$ref": "#/definitions/OemActions",
-                    "description": "The available OEM-specific actions for this resource.",
-                    "longDescription": "This property shall contain the available OEM-specific actions for this resource."
-                }
-            },
-            "type": "object"
-        },
-        "Job": {
-            "additionalProperties": false,
-            "description": "The `Job` schema contains information about a job that a Redfish job service schedules or executes.  Clients create jobs to describe a series of operations that occur at periodic intervals.",
-            "longDescription": "This resource shall contain a job in a Redfish implementation.",
-            "patternProperties": {
-                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
-                    "description": "This property shall specify a valid odata or Redfish property.",
-                    "type": [
-                        "array",
-                        "boolean",
-                        "integer",
-                        "number",
-                        "null",
-                        "object",
-                        "string"
-                    ]
-                }
-            },
-            "properties": {
-                "@odata.context": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/context"
-                },
-                "@odata.etag": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/etag"
-                },
-                "@odata.id": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/id"
-                },
-                "@odata.type": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/type"
-                },
-                "Actions": {
-                    "$ref": "#/definitions/Actions",
-                    "description": "The available actions for this resource.",
-                    "longDescription": "This property shall contain the available actions for this resource."
-                },
-                "CreatedBy": {
-                    "description": "The person or program that created this job entry.",
-                    "longDescription": "This property shall contain the username, software program name, or other identifier indicating the creator of this job.",
-                    "readonly": true,
-                    "type": "string"
-                },
-                "Description": {
-                    "anyOf": [
-                        {
-                            "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Description"
-                        },
-                        {
-                            "type": "null"
-                        }
-                    ],
-                    "readonly": true
-                },
-                "EndTime": {
-                    "description": "The date and time when the job was completed.",
-                    "format": "date-time",
-                    "longDescription": "This property shall indicate the date and time when the job was completed.  This property shall not appear if the job is running or was not completed.  This property shall appear only if the `JobState` is `Completed`, `Cancelled`, or `Exception`.",
-                    "readonly": true,
-                    "type": "string"
-                },
-                "EstimatedDuration": {
-                    "description": "The estimated total time required to complete the job.",
-                    "longDescription": "This property shall indicate the estimated total time needed to complete the job.  The value is not expected to change while the job is in progress, but the service may update the value if it obtains new information that significantly changes the expected duration.  Services should be conservative in the reported estimate and clients should treat this value as an estimate.",
-                    "pattern": "^P(\\d+D)?(T(\\d+H)?(\\d+M)?(\\d+(.\\d+)?S)?)?$",
-                    "readonly": true,
-                    "type": [
-                        "string",
-                        "null"
-                    ],
-                    "versionAdded": "v1_1_0"
-                },
-                "HidePayload": {
-                    "description": "An indication of whether the contents of the payload should be hidden from view after the job has been created.  If `true`, responses do not return the payload.  If `false`, responses return the payload.  If this property is not present when the job is created, the default is `false`.",
-                    "longDescription": "This property shall indicate whether the contents of the payload should be hidden from view after the job has been created.  If `true`, responses shall not return the `Payload` property.  If `false`, responses shall return the `Payload` property.  If this property is not present when the job is created, the default is `false`.",
-                    "readonly": true,
-                    "type": "boolean"
-                },
-                "Id": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Id",
-                    "readonly": true
-                },
-                "JobState": {
-                    "$ref": "#/definitions/JobState",
-                    "description": "The state of the job.",
-                    "longDescription": "This property shall indicate the state of the job.",
-                    "readonly": false
-                },
-                "JobStatus": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Health",
-                    "description": "The status of the job.",
-                    "longDescription": "This property shall indicate the health status of the job.  This property should contain `Critical` if one or more messages in the `Messages` array contains the severity `Critical`.  This property should contain `Warning` if one or more messages in the `Messages` array contains the severity `Warning` and if no messages contain the severity `Critical`.  This property should contain `OK` if all messages in the `Messages` array contain the severity `OK` or if the array is empty.",
-                    "readonly": true
-                },
-                "Links": {
-                    "$ref": "#/definitions/Links",
-                    "description": "The links to other resources that are related to this resource.",
-                    "longDescription": "This property shall contain links to resources that are related to but are not contained by, or subordinate to, this resource.",
-                    "versionAdded": "v1_2_0"
-                },
-                "MaxExecutionTime": {
-                    "description": "The maximum amount of time the job is allowed to execute.",
-                    "longDescription": "The value shall be an ISO 8601 conformant duration describing the maximum duration the job is allowed to execute before being stopped by the service.",
-                    "readonly": false,
-                    "type": [
-                        "string",
-                        "null"
-                    ]
-                },
-                "Messages": {
-                    "description": "An array of messages associated with the job.",
-                    "items": {
-                        "$ref": "http://redfish.dmtf.org/schemas/v1/Message.json#/definitions/Message"
-                    },
-                    "longDescription": "This property shall contain an array of messages associated with the job.",
-                    "type": "array"
-                },
-                "Name": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Name",
-                    "readonly": true
-                },
-                "Oem": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Oem",
-                    "description": "The OEM extension property.",
-                    "longDescription": "This property shall contain the OEM extensions.  All values for properties that this object contains shall conform to the Redfish Specification-described requirements."
-                },
-                "Payload": {
-                    "$ref": "#/definitions/Payload",
-                    "description": "The HTTP and JSON request payload details for this job.",
-                    "longDescription": "This property shall contain the HTTP and JSON request payload information for executing this job.  This property shall not be included in the response if the `HidePayload` property is `true`."
-                },
-                "PercentComplete": {
-                    "description": "The completion percentage of this job.",
-                    "longDescription": "This property shall indicate the completion progress of the job, reported in percent of completion, `0` to `100`.  If the job has not been started, the value shall be zero.",
-                    "maximum": 100,
-                    "minimum": 0,
-                    "readonly": true,
-                    "type": [
-                        "integer",
-                        "null"
-                    ],
-                    "units": "%"
-                },
-                "Schedule": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/Schedule.json#/definitions/Schedule",
-                    "description": "The schedule settings for this job.",
-                    "longDescription": "This object shall contain the scheduling details for this job and the recurrence frequency for future instances of this job."
-                },
-                "StartTime": {
-                    "description": "The date and time when the job was started or is scheduled to start.",
-                    "format": "date-time",
-                    "longDescription": "This property shall indicate the date and time when the job was last started or is scheduled to start.",
-                    "readonly": true,
-                    "type": "string"
-                },
-                "StepOrder": {
-                    "description": "The serialized execution order of the job steps.",
-                    "items": {
-                        "type": "string"
-                    },
-                    "longDescription": "This property shall contain an array of `Id` property values for the job steps in the order that they shall be executed.  Each step shall be completed prior to the execution of the next step in array order.  An incomplete list of steps shall be considered an invalid configuration.  If this property is not present or contains an empty array it shall indicate that the step execution order is omitted and may occur in parallel or in series as determined by the service.",
-                    "readonly": true,
-                    "type": "array"
-                },
-                "Steps": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/JobCollection.json#/definitions/JobCollection",
-                    "description": "The link to a collection of steps for this job.",
-                    "longDescription": "This property shall contain the link to a resource collection of type `JobCollection`.  This property shall not be present if this resource represents a step for a job.",
-                    "readonly": true
-                }
-            },
-            "required": [
-                "@odata.id",
-                "@odata.type",
-                "Id",
-                "Name"
-            ],
-            "type": "object"
-        },
-        "JobState": {
-            "enum": [
-                "New",
-                "Starting",
-                "Running",
-                "Suspended",
-                "Interrupted",
-                "Pending",
-                "Stopping",
-                "Completed",
-                "Cancelled",
-                "Exception",
-                "Service",
-                "UserIntervention",
-                "Continue"
-            ],
-            "enumDescriptions": {
-                "Cancelled": "Job was cancelled.",
-                "Completed": "Job was completed.",
-                "Continue": "Job is to resume operation.",
-                "Exception": "Job has stopped due to an exception condition.",
-                "Interrupted": "Job has been interrupted.",
-                "New": "A new job.",
-                "Pending": "Job is pending and has not started.",
-                "Running": "Job is running normally.",
-                "Service": "Job is running as a service.",
-                "Starting": "Job is starting.",
-                "Stopping": "Job is in the process of stopping.",
-                "Suspended": "Job has been suspended.",
-                "UserIntervention": "Job is waiting for user intervention."
-            },
-            "enumLongDescriptions": {
-                "Cancelled": "This value shall represent that the operation completed because the job was cancelled by an operator.",
-                "Completed": "This value shall represent that the operation completed successfully or with warnings.",
-                "Continue": "This value shall represent that the operation has been resumed from a paused condition and should return to a Running state.",
-                "Exception": "This value shall represent that the operation completed with errors.",
-                "Interrupted": "This value shall represent that the operation has been interrupted but is expected to restart and is therefore not complete.",
-                "New": "This value shall represent that this job is newly created but the operation has not yet started.",
-                "Pending": "This value shall represent that the operation is pending some condition and has not yet begun to execute.",
-                "Running": "This value shall represent that the operation is executing.",
-                "Service": "This value shall represent that the operation is now running as a service and expected to continue operation until stopped or killed.",
-                "Starting": "This value shall represent that the operation is starting.",
-                "Stopping": "This value shall represent that the operation is stopping but is not yet complete.",
-                "Suspended": "This value shall represent that the operation has been suspended but is expected to restart and is therefore not complete.",
-                "UserIntervention": "This value shall represent that the operation is waiting for a user to intervene and needs to be manually continued, stopped, or cancelled."
-            },
-            "type": "string"
-        },
-        "Links": {
-            "additionalProperties": false,
-            "description": "The links to other resources that are related to this resource.",
-            "longDescription": "This Redfish Specification-described type shall contain links to resources that are related to but are not contained by, or subordinate to, this resource.",
-            "patternProperties": {
-                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
-                    "description": "This property shall specify a valid odata or Redfish property.",
-                    "type": [
-                        "array",
-                        "boolean",
-                        "integer",
-                        "number",
-                        "null",
-                        "object",
-                        "string"
-                    ]
-                }
-            },
-            "properties": {
-                "CreatedResources": {
-                    "description": "An array of URIs referencing the resources created as the result of this job.",
-                    "items": {
-                        "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/idRef"
-                    },
-                    "longDescription": "This property shall contain an array of links to resources indicating the resources created as the result of this job.  Services shall set this property prior to the job entering its final state.",
-                    "readonly": true,
-                    "type": "array",
-                    "versionAdded": "v1_2_0"
-                },
-                "CreatedResources@odata.count": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
-                },
-                "Oem": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Oem",
-                    "description": "The OEM extension property.",
-                    "longDescription": "This property shall contain the OEM extensions.  All values for properties contained in this object shall conform to the Redfish Specification-described requirements."
-                }
-            },
-            "type": "object"
-        },
-        "OemActions": {
-            "additionalProperties": true,
-            "description": "The available OEM-specific actions for this resource.",
-            "longDescription": "This type shall contain the available OEM-specific actions for this resource.",
-            "patternProperties": {
-                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
-                    "description": "This property shall specify a valid odata or Redfish property.",
-                    "type": [
-                        "array",
-                        "boolean",
-                        "integer",
-                        "number",
-                        "null",
-                        "object",
-                        "string"
-                    ]
-                }
-            },
-            "properties": {},
-            "type": "object"
-        },
-        "Payload": {
-            "additionalProperties": false,
-            "description": "The HTTP and JSON payload details for this job.",
-            "longDescription": "This object shall contain information detailing the HTTP and JSON payload information for executing this job.",
-            "patternProperties": {
-                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
-                    "description": "This property shall specify a valid odata or Redfish property.",
-                    "type": [
-                        "array",
-                        "boolean",
-                        "integer",
-                        "number",
-                        "null",
-                        "object",
-                        "string"
-                    ]
-                }
-            },
-            "properties": {
-                "HttpHeaders": {
-                    "description": "An array of HTTP headers in this job.",
-                    "items": {
-                        "type": "string"
-                    },
-                    "longDescription": "This property shall contain an array of HTTP headers in this job.",
-                    "readonly": true,
-                    "type": "array"
-                },
-                "HttpOperation": {
-                    "description": "The HTTP operation that executes this job.",
-                    "longDescription": "This property shall contain the HTTP operation that executes this job.",
-                    "readonly": true,
-                    "type": "string"
-                },
-                "JsonBody": {
-                    "description": "The JSON payload to use in the execution of this job.",
-                    "longDescription": "This property shall contain JSON-formatted payload for this job.",
-                    "readonly": true,
-                    "type": "string"
-                },
-                "TargetUri": {
-                    "description": "The link to the target for this job.",
-                    "format": "uri-reference",
-                    "longDescription": "This property shall contain link to a target location for an HTTP operation.",
-                    "readonly": true,
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        }
-    },
-    "language": "en",
-    "owningEntity": "DMTF",
-    "release": "2022.3",
-    "title": "#Job.v1_2_4.Job"
-}
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/Job.v1_3_0.json b/redfish-core/schema/dmtf/json-schema/Job.v1_3_0.json
new file mode 100644
index 0000000..af1eb28
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema/Job.v1_3_0.json
@@ -0,0 +1,869 @@
+{
+    "$id": "http://redfish.dmtf.org/schemas/v1/Job.v1_3_0.json",
+    "$ref": "#/definitions/Job",
+    "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
+    "copyright": "Copyright 2014-2025 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
+    "definitions": {
+        "Actions": {
+            "additionalProperties": false,
+            "description": "The available actions for this resource.",
+            "longDescription": "This type shall contain the available actions for this resource.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "#Job.Cancel": {
+                    "$ref": "#/definitions/Cancel"
+                },
+                "#Job.ForceStart": {
+                    "$ref": "#/definitions/ForceStart"
+                },
+                "#Job.Invalidate": {
+                    "$ref": "#/definitions/Invalidate"
+                },
+                "#Job.Resubmit": {
+                    "$ref": "#/definitions/Resubmit"
+                },
+                "#Job.Resume": {
+                    "$ref": "#/definitions/Resume"
+                },
+                "#Job.Suspend": {
+                    "$ref": "#/definitions/Suspend"
+                },
+                "#Job.Validate": {
+                    "$ref": "#/definitions/Validate"
+                },
+                "Oem": {
+                    "$ref": "#/definitions/OemActions",
+                    "description": "The available OEM-specific actions for this resource.",
+                    "longDescription": "This property shall contain the available OEM-specific actions for this resource."
+                }
+            },
+            "type": "object"
+        },
+        "Cancel": {
+            "additionalProperties": false,
+            "description": "Cancels the job.",
+            "longDescription": "This action shall cancel the job if it is currently in the `Running`, `Invalid`, or `Suspended` states.  The job shall transition to `Cancelled` if the action is successful.",
+            "parameters": {},
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "target": {
+                    "description": "Link to invoke action",
+                    "format": "uri-reference",
+                    "type": "string"
+                },
+                "title": {
+                    "description": "Friendly action name",
+                    "type": "string"
+                }
+            },
+            "type": "object",
+            "versionAdded": "v1_3_0"
+        },
+        "ForceStart": {
+            "additionalProperties": false,
+            "description": "Forces the job to start.",
+            "longDescription": "This action shall force the job to start running if it is in the `Pending` state.  The job shall transition to `Running` if the action is successful.",
+            "parameters": {},
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "target": {
+                    "description": "Link to invoke action",
+                    "format": "uri-reference",
+                    "type": "string"
+                },
+                "title": {
+                    "description": "Friendly action name",
+                    "type": "string"
+                }
+            },
+            "type": "object",
+            "versionAdded": "v1_3_0"
+        },
+        "Invalidate": {
+            "additionalProperties": false,
+            "description": "Invalidates the job.",
+            "longDescription": "This action shall invalidate the job if it is in the `Pending` state.  The job shall transition to `Invalid` if the action is successful.",
+            "parameters": {},
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "target": {
+                    "description": "Link to invoke action",
+                    "format": "uri-reference",
+                    "type": "string"
+                },
+                "title": {
+                    "description": "Friendly action name",
+                    "type": "string"
+                }
+            },
+            "type": "object",
+            "versionAdded": "v1_3_0"
+        },
+        "Job": {
+            "additionalProperties": false,
+            "description": "The `Job` schema contains information about a job that a Redfish job service schedules or executes.  Clients create jobs to describe a series of operations that occur at periodic intervals.",
+            "longDescription": "This resource shall contain a job in a Redfish implementation.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "@odata.context": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/context"
+                },
+                "@odata.etag": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/etag"
+                },
+                "@odata.id": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/id"
+                },
+                "@odata.type": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/type"
+                },
+                "Actions": {
+                    "$ref": "#/definitions/Actions",
+                    "description": "The available actions for this resource.",
+                    "longDescription": "This property shall contain the available actions for this resource."
+                },
+                "CreatedBy": {
+                    "description": "The person or program that created this job entry.",
+                    "longDescription": "This property shall contain the username, software program name, or other identifier indicating the creator of this job.",
+                    "readonly": true,
+                    "type": "string"
+                },
+                "CreationTime": {
+                    "description": "The date and time when the job was created.",
+                    "format": "date-time",
+                    "longDescription": "This property shall contain the date and time when the job was created.",
+                    "readonly": true,
+                    "type": "string",
+                    "versionAdded": "v1_3_0"
+                },
+                "Description": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Description"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "readonly": true
+                },
+                "EndTime": {
+                    "description": "The date and time when the job was completed.",
+                    "format": "date-time",
+                    "longDescription": "This property shall contain the date and time when the job was completed.  This property shall not appear if the job is running or was not completed.  This property shall appear only if the `JobState` is `Completed`, `Cancelled`, or `Exception`.",
+                    "readonly": true,
+                    "type": "string"
+                },
+                "EstimatedCompletionTime": {
+                    "description": "The date and time when the job is expected to complete.",
+                    "excerpt": "Job",
+                    "format": "date-time",
+                    "longDescription": "This property shall contain the date and time when the job is expected to complete.  If the `EstimatedDuration` property is supported, the value of this property shall contain the summation of the `StartTime` property and the `EstimatedDuration` property.",
+                    "readonly": true,
+                    "type": "string",
+                    "versionAdded": "v1_3_0"
+                },
+                "EstimatedDuration": {
+                    "description": "The estimated total time required to complete the job.",
+                    "longDescription": "This property shall contain the estimated total time needed to complete the job.  The value is not expected to change while the job is in progress, but the service may update the value if it obtains new information that significantly changes the expected duration.  Services should be conservative in the reported estimate and clients should treat this value as an estimate.",
+                    "pattern": "^P(\\d+D)?(T(\\d+H)?(\\d+M)?(\\d+(.\\d+)?S)?)?$",
+                    "readonly": true,
+                    "type": [
+                        "string",
+                        "null"
+                    ],
+                    "versionAdded": "v1_1_0"
+                },
+                "HidePayload": {
+                    "description": "An indication of whether the contents of the payload or parameters should be hidden from view after the job has been created.  If `true`, responses do not return the payload or parameters.  If `false`, responses return the payload or parameters.  If this property is not present when the job is created, the default is `false`.",
+                    "longDescription": "This property shall indicate whether the contents of the payload should be hidden from view after the job has been created.  If `true`, responses shall not return the `Payload` or `Parameters` properties.  If `false`, responses shall return the `Payload` or `Parameters` properties.  If this property is not present when the job is created, the default is `false`.",
+                    "readonly": true,
+                    "type": "boolean"
+                },
+                "Id": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Id",
+                    "readonly": true
+                },
+                "JobPriority": {
+                    "description": "The requested priority for this job.",
+                    "longDescription": "This property shall contain the requested priority of this job.  The value `0` shall indicate the highest priority.  Increasing values shall represent decreasing priority.",
+                    "minimum": 0,
+                    "readonly": true,
+                    "type": [
+                        "integer",
+                        "null"
+                    ],
+                    "versionAdded": "v1_3_0"
+                },
+                "JobState": {
+                    "$ref": "#/definitions/JobState",
+                    "description": "The state of the job.",
+                    "excerpt": "Job",
+                    "longDescription": "This property shall contain the state of the job.",
+                    "readonly": false
+                },
+                "JobStatus": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Health",
+                    "description": "The status of the job.",
+                    "longDescription": "This property shall contain the health status of the job.  This property should contain `Critical` if one or more messages in the `Messages` array contains the severity `Critical`.  This property should contain `Warning` if one or more messages in the `Messages` array contains the severity `Warning` and if no messages contain the severity `Critical`.  This property should contain `OK` if all messages in the `Messages` array contain the severity `OK` or if the array is empty.",
+                    "readonly": true
+                },
+                "JobType": {
+                    "$ref": "#/definitions/JobType",
+                    "description": "The type of this job.",
+                    "longDescription": "This property shall contain the type of this job.",
+                    "readonly": true,
+                    "versionAdded": "v1_3_0"
+                },
+                "Links": {
+                    "$ref": "#/definitions/Links",
+                    "description": "The links to other resources that are related to this resource.",
+                    "longDescription": "This property shall contain links to resources that are related to but are not contained by, or subordinate to, this resource.",
+                    "versionAdded": "v1_2_0"
+                },
+                "MaxExecutionTime": {
+                    "description": "The maximum amount of time the job is allowed to execute.",
+                    "longDescription": "This property shall contain the maximum duration the job is allowed to execute before being stopped by the service.",
+                    "pattern": "^P(\\d+D)?(T(\\d+H)?(\\d+M)?(\\d+(.\\d+)?S)?)?$",
+                    "readonly": false,
+                    "type": [
+                        "string",
+                        "null"
+                    ]
+                },
+                "Messages": {
+                    "description": "An array of messages associated with the job.",
+                    "items": {
+                        "$ref": "http://redfish.dmtf.org/schemas/v1/Message.json#/definitions/Message"
+                    },
+                    "longDescription": "This property shall contain an array of messages associated with the job.",
+                    "type": "array"
+                },
+                "Name": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Name",
+                    "readonly": true
+                },
+                "Oem": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Oem",
+                    "description": "The OEM extension property.",
+                    "longDescription": "This property shall contain the OEM extensions.  All values for properties that this object contains shall conform to the Redfish Specification-described requirements."
+                },
+                "Parameters": {
+                    "$ref": "#/definitions/Parameters",
+                    "description": "The parameters specified for running this document-based job.",
+                    "longDescription": "This property shall contain the parameters specified for running this document-based job.  This property shall only be present for document-based jobs and if the `HidePayload` property is `false`.",
+                    "versionAdded": "v1_3_0"
+                },
+                "Payload": {
+                    "$ref": "#/definitions/Payload",
+                    "description": "The HTTP and JSON request payload details for this user-specified job.",
+                    "longDescription": "This property shall contain the HTTP and JSON request payload information for executing this user-specified job.  This property shall only be present for user-specified jobs and if the `HidePayload` property is `false`."
+                },
+                "PercentComplete": {
+                    "description": "The completion percentage of this job.",
+                    "excerpt": "Job",
+                    "longDescription": "This property shall contain the completion progress of the job, reported in percent of completion, `0` to `100`.  If the job has not been started, the value shall be zero.",
+                    "maximum": 100,
+                    "minimum": 0,
+                    "readonly": true,
+                    "type": [
+                        "integer",
+                        "null"
+                    ],
+                    "units": "%"
+                },
+                "Schedule": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Schedule.json#/definitions/Schedule",
+                    "description": "The schedule settings for this job.",
+                    "longDescription": "This property shall contain the scheduling details for this job and the recurrence frequency for future instances of this job.  This property shall not be present for document-based jobs."
+                },
+                "StartTime": {
+                    "description": "The date and time when the job was started or is scheduled to start.",
+                    "format": "date-time",
+                    "longDescription": "This property shall contain the date and time when the job was last started or is scheduled to start.",
+                    "readonly": true,
+                    "type": "string"
+                },
+                "StepOrder": {
+                    "description": "The serialized execution order of the job steps.",
+                    "items": {
+                        "type": "string"
+                    },
+                    "longDescription": "This property shall contain an array of `Id` property values for the job steps in the order that they shall be executed.  Each step shall be completed prior to the execution of the next step in array order.  An incomplete list of steps shall be considered an invalid configuration.  If this property is not present or contains an empty array it shall indicate that the step execution order is omitted and may occur in parallel or in series as determined by the service.  This property shall not be present for document-based jobs.",
+                    "readonly": true,
+                    "type": "array"
+                },
+                "Steps": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/JobCollection.json#/definitions/JobCollection",
+                    "description": "The link to a collection of steps for this job.",
+                    "longDescription": "This property shall contain the link to a resource collection of type `JobCollection`.  This property shall not be present if this resource represents a step for a job.  This property shall not be present for document-based jobs.",
+                    "readonly": true
+                }
+            },
+            "required": [
+                "@odata.id",
+                "@odata.type",
+                "Id",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "JobExcerpt": {
+            "additionalProperties": false,
+            "description": "The `Job` schema contains information about a job that a Redfish job service schedules or executes.  Clients create jobs to describe a series of operations that occur at periodic intervals.",
+            "excerpt": "Job",
+            "longDescription": "This resource shall contain a job in a Redfish implementation.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "EstimatedCompletionTime": {
+                    "description": "The date and time when the job is expected to complete.",
+                    "excerpt": "Job",
+                    "format": "date-time",
+                    "longDescription": "This property shall contain the date and time when the job is expected to complete.  If the `EstimatedDuration` property is supported, the value of this property shall contain the summation of the `StartTime` property and the `EstimatedDuration` property.",
+                    "readonly": true,
+                    "type": "string",
+                    "versionAdded": "v1_3_0"
+                },
+                "JobState": {
+                    "$ref": "#/definitions/JobState",
+                    "description": "The state of the job.",
+                    "excerpt": "Job",
+                    "longDescription": "This property shall contain the state of the job.",
+                    "readonly": false
+                },
+                "PercentComplete": {
+                    "description": "The completion percentage of this job.",
+                    "excerpt": "Job",
+                    "longDescription": "This property shall contain the completion progress of the job, reported in percent of completion, `0` to `100`.  If the job has not been started, the value shall be zero.",
+                    "maximum": 100,
+                    "minimum": 0,
+                    "readonly": true,
+                    "type": [
+                        "integer",
+                        "null"
+                    ],
+                    "units": "%"
+                }
+            },
+            "type": "object"
+        },
+        "JobState": {
+            "enum": [
+                "New",
+                "Starting",
+                "Running",
+                "Suspended",
+                "Interrupted",
+                "Pending",
+                "Stopping",
+                "Completed",
+                "Cancelled",
+                "Exception",
+                "Service",
+                "UserIntervention",
+                "Continue",
+                "Validating",
+                "Invalid"
+            ],
+            "enumDescriptions": {
+                "Cancelled": "Job was cancelled.",
+                "Completed": "Job was completed.",
+                "Continue": "Job is to resume operation.",
+                "Exception": "Job has stopped due to an exception condition.",
+                "Interrupted": "Job has been interrupted.",
+                "Invalid": "Job is invalid.",
+                "New": "A new job.",
+                "Pending": "Job is pending and has not started.",
+                "Running": "Job is running normally.",
+                "Service": "Job is running as a service.",
+                "Starting": "Job is starting.",
+                "Stopping": "Job is in the process of stopping.",
+                "Suspended": "Job has been suspended.",
+                "UserIntervention": "Job is waiting for user intervention.",
+                "Validating": "Job is validating."
+            },
+            "enumLongDescriptions": {
+                "Cancelled": "This value shall indicate that the operation completed because the job was cancelled by an operator.  The job may restart in the future based on the scheduling configuration of the job or operations performed by a user.",
+                "Completed": "This value shall indicate that the operation completed successfully or with warnings.  The job may restart in the future based on the scheduling configuration of the job or operations performed by a user.",
+                "Continue": "This value shall indicate that the operation has been resumed from a paused condition and should return to a Running state.",
+                "Exception": "This value shall indicate that the operation completed with errors.  The job may restart in the future based on the scheduling configuration of the job or operations performed by a user.",
+                "Interrupted": "This value shall indicate that the operation has been interrupted but is expected to restart and is therefore not complete.",
+                "Invalid": "This value shall indicate that validation has determined that the system is not properly configured to run the document-based job.  To perform validation checks again, perform the `Validate` action.",
+                "New": "This value shall indicate that this job is newly created but the operation has not yet started.  This shall be the initial state for document-based jobs.  Upon receiving the `Validate` action, or if the value of `ValidationPolicy` in the `JobService` resource contains `Automatic`, the document-based job's `JobState` shall transition to `Validating`.  If the `ValidationPolicy` property in the `JobService` resource contains `Bypass`, the `JobState` for a document-based job shall transition to `Pending`.",
+                "Pending": "This value shall indicate that the operation is pending some condition and has not yet begun to execute.",
+                "Running": "This value shall indicate that the operation is executing.  Jobs that complete successfully shall transition from this state to the `Completed` state.  Jobs that do not complete successfully shall transition from this state to the `Exception` state.",
+                "Service": "This value shall indicate that the operation is now running as a service and expected to continue operation until stopped or killed.",
+                "Starting": "This value shall indicate that the operation is starting.",
+                "Stopping": "This value shall indicate that the operation is stopping but is not yet complete.",
+                "Suspended": "This value shall indicate that the operation has been suspended but is expected to restart and is therefore not complete.  To resume a job, perform the `Resume` action.",
+                "UserIntervention": "This value shall indicate that the operation is waiting for a user to intervene and needs to be manually continued, stopped, or cancelled.",
+                "Validating": "This value shall indicate that the document-based job is validating the state of the system to determine if it can run.  For example, a job that runs on factory equipment might check to ensure that the equipment is properly configured and has sufficient ingredients to run the job.  If the validation checks fail, the job shall transition to the `Invalid` state.  If the validation checks are successful, the job shall transition to the `Pending` state."
+            },
+            "enumVersionAdded": {
+                "Invalid": "v1_3_0",
+                "Validating": "v1_3_0"
+            },
+            "type": "string"
+        },
+        "JobType": {
+            "enum": [
+                "DocumentBased",
+                "UserSpecified",
+                "ServiceGenerated"
+            ],
+            "enumDescriptions": {
+                "DocumentBased": "A document-based job.",
+                "ServiceGenerated": "A service-generated job.",
+                "UserSpecified": "A user-specified job."
+            },
+            "enumLongDescriptions": {
+                "DocumentBased": "This value shall indicate a job that was created by performing the `SubmitJob` action on a `JobDocument` resource.",
+                "ServiceGenerated": "This value shall indicate a job that was created automatically by the service as part of its internal policies.",
+                "UserSpecified": "This value shall indicate a job that was created by performing an HTTP `POST` operation on a `JobCollection` resource."
+            },
+            "type": "string"
+        },
+        "Links": {
+            "additionalProperties": false,
+            "description": "The links to other resources that are related to this resource.",
+            "longDescription": "This Redfish Specification-described type shall contain links to resources that are related to but are not contained by, or subordinate to, this resource.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "CreatedResources": {
+                    "description": "An array of URIs referencing the resources created as the result of this job.",
+                    "items": {
+                        "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/idRef"
+                    },
+                    "longDescription": "This property shall contain an array of links to resources indicating the resources created as the result of this job.  Services shall set this property prior to the job entering its final state.",
+                    "readonly": true,
+                    "type": "array",
+                    "versionAdded": "v1_2_0"
+                },
+                "CreatedResources@odata.count": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
+                },
+                "Executor": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/JobExecutor.json#/definitions/JobExecutor"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "A link to the executor that is running this job.",
+                    "longDescription": "This property shall contain a link to a resource of type `JobExecutor` that represents the executor that is running this job.",
+                    "readonly": true,
+                    "versionAdded": "v1_3_0"
+                },
+                "JobDocument": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/JobDocument.json#/definitions/JobDocument"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "A link to the job document that was used to create this job.",
+                    "longDescription": "This property shall contain a link to a resource of type `JobDocument` that represents the job document that was used to create this job.",
+                    "readonly": true,
+                    "versionAdded": "v1_3_0"
+                },
+                "Oem": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Oem",
+                    "description": "The OEM extension property.",
+                    "longDescription": "This property shall contain the OEM extensions.  All values for properties contained in this object shall conform to the Redfish Specification-described requirements."
+                },
+                "ParentJob": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Job.json#/definitions/Job"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The link to the job that created this job.",
+                    "longDescription": "This property shall contain a link to a resource of type `Job` that represents the job that created this job.",
+                    "readonly": true,
+                    "versionAdded": "v1_3_0"
+                },
+                "PreferredExecutors": {
+                    "description": "An array of links to the preferred executors to run this job.",
+                    "items": {
+                        "$ref": "http://redfish.dmtf.org/schemas/v1/JobExecutor.json#/definitions/JobExecutor"
+                    },
+                    "longDescription": "This property shall contain an array of links to resources of type `JobExecutor` that represent the preferred executors to run this job.",
+                    "readonly": true,
+                    "type": "array",
+                    "versionAdded": "v1_3_0"
+                },
+                "PreferredExecutors@odata.count": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
+                },
+                "SubsidiaryJobs": {
+                    "description": "An array of links to the jobs created by this job.",
+                    "items": {
+                        "$ref": "http://redfish.dmtf.org/schemas/v1/Job.json#/definitions/Job"
+                    },
+                    "longDescription": "This property shall contain an array of links to resources of type `Job` that represent the jobs created by this job.",
+                    "readonly": true,
+                    "type": "array",
+                    "versionAdded": "v1_3_0"
+                },
+                "SubsidiaryJobs@odata.count": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
+                },
+                "ValidatedExecutors": {
+                    "description": "An array of links to the executors that have been validated to run this job.",
+                    "items": {
+                        "$ref": "http://redfish.dmtf.org/schemas/v1/JobExecutor.json#/definitions/JobExecutor"
+                    },
+                    "longDescription": "This property shall contain an array of links to resources of type `JobExecutor` that represent the executors that have been validated to run this job.",
+                    "readonly": true,
+                    "type": "array",
+                    "versionAdded": "v1_3_0"
+                },
+                "ValidatedExecutors@odata.count": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
+                }
+            },
+            "type": "object"
+        },
+        "OemActions": {
+            "additionalProperties": true,
+            "description": "The available OEM-specific actions for this resource.",
+            "longDescription": "This type shall contain the available OEM-specific actions for this resource.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {},
+            "type": "object"
+        },
+        "Parameters": {
+            "additionalProperties": true,
+            "description": "The parameters used when running this instance of the job.",
+            "longDescription": "This type shall contain the parameters to use when running this job.  Each property-value pair specifies a parameter and its value as specified when the job was submitted.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                },
+                "^[A-Za-z][A-Za-z0-9_]+$": {
+                    "type": [
+                        "string",
+                        "boolean",
+                        "number",
+                        "null"
+                    ]
+                }
+            },
+            "properties": {},
+            "type": "object"
+        },
+        "Payload": {
+            "additionalProperties": false,
+            "description": "The HTTP and JSON payload details for this job.",
+            "longDescription": "This object shall contain information detailing the HTTP and JSON payload information for executing this job.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "HttpHeaders": {
+                    "description": "An array of HTTP headers in this job.",
+                    "items": {
+                        "type": "string"
+                    },
+                    "longDescription": "This property shall contain an array of HTTP headers in this job.",
+                    "readonly": true,
+                    "type": "array"
+                },
+                "HttpOperation": {
+                    "description": "The HTTP operation that executes this job.",
+                    "longDescription": "This property shall contain the HTTP operation that executes this job.",
+                    "readonly": true,
+                    "type": "string"
+                },
+                "JsonBody": {
+                    "description": "The JSON payload to use in the execution of this job.",
+                    "longDescription": "This property shall contain JSON-formatted payload for this job.",
+                    "readonly": true,
+                    "type": "string"
+                },
+                "TargetUri": {
+                    "description": "The link to the target for this job.",
+                    "format": "uri-reference",
+                    "longDescription": "This property shall contain link to a target location for an HTTP operation.",
+                    "readonly": true,
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "Resubmit": {
+            "additionalProperties": false,
+            "description": "Resubmits the job.",
+            "longDescription": "This action shall resubmit a job to the job service.  The new job shall be based on the job document, and properties of the resource associated with this action.  Services shall take appropriate measures to make sure that appropriate security is maintained - for instance, only allowing the same user that created the job to resubmit it.",
+            "parameters": {
+                "StartTime": {
+                    "description": "The time to start the job.",
+                    "format": "date-time",
+                    "longDescription": "This parameter shall contain the time to start the job.",
+                    "type": "string"
+                }
+            },
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "target": {
+                    "description": "Link to invoke action",
+                    "format": "uri-reference",
+                    "type": "string"
+                },
+                "title": {
+                    "description": "Friendly action name",
+                    "type": "string"
+                }
+            },
+            "type": "object",
+            "versionAdded": "v1_3_0"
+        },
+        "Resume": {
+            "additionalProperties": false,
+            "description": "Resumes the job.",
+            "longDescription": "This action shall resume the job if it is in the `Suspended` state.  The job shall transition to `Running` if the action is successful.",
+            "parameters": {},
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "target": {
+                    "description": "Link to invoke action",
+                    "format": "uri-reference",
+                    "type": "string"
+                },
+                "title": {
+                    "description": "Friendly action name",
+                    "type": "string"
+                }
+            },
+            "type": "object",
+            "versionAdded": "v1_3_0"
+        },
+        "Suspend": {
+            "additionalProperties": false,
+            "description": "Suspends the job.",
+            "longDescription": "This action shall suspend the job if it is in the `Running` state.  The job shall transition to `Suspended` if the action is successful.",
+            "parameters": {},
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "target": {
+                    "description": "Link to invoke action",
+                    "format": "uri-reference",
+                    "type": "string"
+                },
+                "title": {
+                    "description": "Friendly action name",
+                    "type": "string"
+                }
+            },
+            "type": "object",
+            "versionAdded": "v1_3_0"
+        },
+        "Validate": {
+            "additionalProperties": false,
+            "description": "Validates the job.",
+            "longDescription": "This action shall request the validation the job if it is in the `New` state.  The job shall transition to `Pending` if the action is successful.  If the job is not valid, it shall transition to `Invalid`.",
+            "parameters": {},
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "target": {
+                    "description": "Link to invoke action",
+                    "format": "uri-reference",
+                    "type": "string"
+                },
+                "title": {
+                    "description": "Friendly action name",
+                    "type": "string"
+                }
+            },
+            "type": "object",
+            "versionAdded": "v1_3_0"
+        }
+    },
+    "language": "en",
+    "owningEntity": "DMTF",
+    "release": "2025.2",
+    "title": "#Job.v1_3_0.Job"
+}
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/JobDocument.v1_0_0.json b/redfish-core/schema/dmtf/json-schema/JobDocument.v1_0_0.json
new file mode 100644
index 0000000..3ee7f6e
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema/JobDocument.v1_0_0.json
@@ -0,0 +1,430 @@
+{
+    "$id": "http://redfish.dmtf.org/schemas/v1/JobDocument.v1_0_0.json",
+    "$ref": "#/definitions/JobDocument",
+    "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
+    "copyright": "Copyright 2014-2025 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
+    "definitions": {
+        "Actions": {
+            "additionalProperties": false,
+            "description": "The available actions for this resource.",
+            "longDescription": "This type shall contain the available actions for this resource.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "#JobDocument.SubmitJob": {
+                    "$ref": "#/definitions/SubmitJob"
+                },
+                "Oem": {
+                    "$ref": "#/definitions/OemActions",
+                    "description": "The available OEM-specific actions for this resource.",
+                    "longDescription": "This property shall contain the available OEM-specific actions for this resource."
+                }
+            },
+            "type": "object"
+        },
+        "DataType": {
+            "enum": [
+                "Boolean",
+                "Number",
+                "String"
+            ],
+            "enumDescriptions": {
+                "Boolean": "A boolean.",
+                "Number": "A number.",
+                "String": "A string."
+            },
+            "type": "string"
+        },
+        "JobDocument": {
+            "additionalProperties": false,
+            "description": "The `JobDocument` schema describes the template for a job with a set of parameters.",
+            "longDescription": "This resource shall represent a job document for a Redfish implementation.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "@odata.context": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/context"
+                },
+                "@odata.etag": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/etag"
+                },
+                "@odata.id": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/id"
+                },
+                "@odata.type": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/type"
+                },
+                "Actions": {
+                    "$ref": "#/definitions/Actions",
+                    "description": "The available actions for this resource.",
+                    "longDescription": "This property shall contain the available actions for this resource."
+                },
+                "CreationTime": {
+                    "description": "The date and time when this job document resource was created.",
+                    "format": "date-time",
+                    "longDescription": "This property shall contain the date and time when this job document resource was created.",
+                    "readonly": true,
+                    "type": "string"
+                },
+                "Description": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Description"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "readonly": true
+                },
+                "DocumentData": {
+                    "description": "The job document data as a Base64-encoded string.",
+                    "longDescription": "This property shall contain a Base64-encoded string of the job document data.  This property shall not be present if `DocumentDataURI` is present.",
+                    "readonly": true,
+                    "type": "string"
+                },
+                "DocumentDataHash": {
+                    "description": "The hash of the job document data.",
+                    "longDescription": "This property shall contain the hash of the job document data as a hex-encoded string.",
+                    "pattern": "^[0-9a-fA-F]+$",
+                    "readonly": true,
+                    "type": "string"
+                },
+                "DocumentDataURI": {
+                    "description": "The URI at which to access the job document data.",
+                    "format": "uri-reference",
+                    "longDescription": "This property shall contain the URI at which to access the job document data.  This property shall not be present if `DocumentData` is present.",
+                    "readonly": true,
+                    "type": "string"
+                },
+                "DocumentType": {
+                    "description": "The type of job document data associated with this job document.",
+                    "longDescription": "This property shall contain the type of job document data associated with this job document.",
+                    "readonly": true,
+                    "type": "string"
+                },
+                "Id": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Id",
+                    "readonly": true
+                },
+                "Links": {
+                    "$ref": "#/definitions/Links",
+                    "description": "The links to other resources that are related to this resource.",
+                    "longDescription": "This property shall contain links to resources that are related to but are not contained by, or subordinate to, this resource."
+                },
+                "Name": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Name",
+                    "readonly": true
+                },
+                "Oem": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Oem",
+                    "description": "The OEM extension property.",
+                    "longDescription": "This property shall contain the OEM extensions.  All values for properties that this object contains shall conform to the Redfish Specification-described requirements."
+                },
+                "ParameterMetadata": {
+                    "description": "The metadata for each of the parameters supported by this job document for the `SubmitJob` action.",
+                    "items": {
+                        "$ref": "#/definitions/ParameterMetadata"
+                    },
+                    "longDescription": "This property shall contain the metadata for each of the parameters supported by this job document for the `SubmitJob` action.",
+                    "type": "array"
+                },
+                "Status": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Status",
+                    "description": "The status and health of the resource and its subordinate or dependent resources.",
+                    "longDescription": "This property shall contain any status or health properties of the resource."
+                },
+                "Version": {
+                    "description": "The version of this job document.",
+                    "longDescription": "This property shall contain the version of this job document.",
+                    "readonly": true,
+                    "type": "string"
+                }
+            },
+            "required": [
+                "@odata.id",
+                "@odata.type",
+                "Id",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "Links": {
+            "additionalProperties": false,
+            "description": "The links to other resources that are related to this resource.",
+            "longDescription": "This Redfish Specification-described type shall contain links to resources that are related to but are not contained by, or subordinate to, this resource.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "SupportedExecutors": {
+                    "description": "An array of links to the executors that are capable of running jobs instantiated from this job document.",
+                    "items": {
+                        "$ref": "http://redfish.dmtf.org/schemas/v1/JobExecutor.json#/definitions/JobExecutor"
+                    },
+                    "longDescription": "This property shall contain an array of links to resources of type `JobExecutor` that represent the executors that are capable of running jobs instantiated from this job document.",
+                    "readonly": true,
+                    "type": "array"
+                },
+                "SupportedExecutors@odata.count": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
+                }
+            },
+            "type": "object"
+        },
+        "OemActions": {
+            "additionalProperties": true,
+            "description": "The available OEM-specific actions for this resource.",
+            "longDescription": "This type shall contain the available OEM-specific actions for this resource.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {},
+            "type": "object"
+        },
+        "Parameter": {
+            "additionalProperties": false,
+            "description": "An object containing a set of parameters for submitting a new job based on a job document.",
+            "longDescription": "This type shall contain a set of parameters for submitting a new job based on a job document.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                },
+                "^[A-Za-z][A-Za-z0-9_]+$": {
+                    "type": [
+                        "string",
+                        "boolean",
+                        "number",
+                        "null"
+                    ]
+                }
+            },
+            "properties": {},
+            "type": "object"
+        },
+        "ParameterMetadata": {
+            "additionalProperties": false,
+            "description": "The metadata for a parameter supported by a job document for the `SubmitJob` action.",
+            "longDescription": "This type shall contain the metadata a parameter supported by a job document for the `SubmitJob` action.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "AllowableNumbers": {
+                    "description": "The allowable numeric values or duration values, inclusive ranges of values, and incremental step values for this parameter.",
+                    "items": {
+                        "type": "string"
+                    },
+                    "longDescription": "This property shall indicate the allowable numeric values, inclusive ranges of values, and incremental step values for this parameter, as defined in the 'Allowable values for numbers and durations' clause of the Redfish Specification.  This property shall only be present for numeric parameters or string parameters that specify a duration.",
+                    "readonly": true,
+                    "type": "array"
+                },
+                "AllowablePattern": {
+                    "description": "The allowable pattern for this parameter.",
+                    "longDescription": "This property shall contain a regular expression that describes the allowable values for this parameter.  This property shall only be present for string parameters.",
+                    "readonly": true,
+                    "type": "string"
+                },
+                "AllowableValueDescriptions": {
+                    "description": "Descriptions of allowable values for this parameter.",
+                    "items": {
+                        "type": "string"
+                    },
+                    "longDescription": "This property shall contain the descriptions of allowable values for this parameter.  The descriptions shall appear in the same array order as the `AllowableValues` property.",
+                    "readonly": true,
+                    "type": "array"
+                },
+                "AllowableValues": {
+                    "description": "The allowable values for this parameter.",
+                    "items": {
+                        "type": "string"
+                    },
+                    "longDescription": "This property shall indicate the allowable values for this parameter.",
+                    "readonly": true,
+                    "type": "array"
+                },
+                "DataType": {
+                    "$ref": "#/definitions/DataType",
+                    "description": "The JSON property type for this parameter.",
+                    "longDescription": "This property shall contain the JSON property type for this parameter.",
+                    "readonly": true
+                },
+                "Description": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Description",
+                    "description": "A description of the parameter.",
+                    "longDescription": "This property shall contain a description of the parameter.",
+                    "readonly": true
+                },
+                "MaximumValue": {
+                    "description": "The maximum supported value for this parameter.",
+                    "longDescription": "This integer or number property shall contain the maximum value that this service supports.  This property shall not be present for non-integer or number parameters.",
+                    "readonly": true,
+                    "type": "number"
+                },
+                "MinimumValue": {
+                    "description": "The minimum supported value for this parameter.",
+                    "longDescription": "This integer or number property shall contain the minimum value that this service supports.  This property shall not be present for non-integer or number parameters.",
+                    "readonly": true,
+                    "type": "number"
+                },
+                "Name": {
+                    "description": "The name of the parameter.",
+                    "longDescription": "This property shall contain the name of the parameter.",
+                    "readonly": true,
+                    "type": "string"
+                },
+                "Required": {
+                    "description": "An indication of whether the parameter is required.",
+                    "longDescription": "This property shall indicate whether the parameter is required.",
+                    "readonly": true,
+                    "type": "boolean"
+                },
+                "ValueHint": {
+                    "description": "A hint value for the parameter.",
+                    "longDescription": "This property shall contain a hint value for the parameter.",
+                    "readonly": true,
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DataType",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "SubmitJob": {
+            "additionalProperties": false,
+            "description": "Creates a new job based on the contents of this job document and additional parameters.",
+            "longDescription": "This action shall create a new `Job` resource based on the contents of this job document and additional parameters.",
+            "parameters": {
+                "HidePayload": {
+                    "description": "An indication of whether the contents of the parameters should be hidden from view after the job has been created.  If `true`, responses do not return the parameters.  If `false`, responses return the parameters.  If this parameter is not present when the job is created, the default is `false`.",
+                    "longDescription": "This parameter shall indicate whether the contents of the parameters should be hidden from view after the job has been created.  If `true`, responses shall not return the `Parameters` property.  If `false`, responses shall return the `Parameters` property.  If this parameter is not present when the job is created, the default is `false`.",
+                    "type": "boolean"
+                },
+                "JobCreator": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Job.json#/definitions/Job",
+                    "description": "The link to the job that is submitting this job.",
+                    "longDescription": "This parameter shall contain a link to a resource of type `Job` that represents the job that is submitting this job."
+                },
+                "Parameters": {
+                    "$ref": "#/definitions/Parameter",
+                    "description": "The list of parameters for the new job that are specific to this job document.",
+                    "longDescription": "This parameter shall contain the list of parameters for the new job that are specific to this job document.  Services shall reject requests containing parameters that do not meet the requirements specified by the `ParameterMetadata` property.",
+                    "requiredParameter": true
+                },
+                "PreferredExecutors": {
+                    "description": "An array of links to the preferred executors to run this job.",
+                    "items": {
+                        "$ref": "http://redfish.dmtf.org/schemas/v1/JobExecutor.json#/definitions/JobExecutor"
+                    },
+                    "longDescription": "This parameter shall contain an array of links to resources of type `JobExecutor` that represent the preferred executors to run this job.",
+                    "requiredParameter": true,
+                    "type": "array"
+                },
+                "StartTime": {
+                    "description": "The date and time when the job is scheduled to start.",
+                    "format": "date-time",
+                    "longDescription": "This parameter shall contain the date and time when the job is scheduled to start.",
+                    "type": "string"
+                }
+            },
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "target": {
+                    "description": "Link to invoke action",
+                    "format": "uri-reference",
+                    "type": "string"
+                },
+                "title": {
+                    "description": "Friendly action name",
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        }
+    },
+    "language": "en",
+    "owningEntity": "DMTF",
+    "release": "2025.2",
+    "title": "#JobDocument.v1_0_0.JobDocument"
+}
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/JobDocumentCollection.json b/redfish-core/schema/dmtf/json-schema/JobDocumentCollection.json
new file mode 100644
index 0000000..48be12b
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema/JobDocumentCollection.json
@@ -0,0 +1,100 @@
+{
+    "$id": "http://redfish.dmtf.org/schemas/v1/JobDocumentCollection.json",
+    "$ref": "#/definitions/JobDocumentCollection",
+    "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
+    "copyright": "Copyright 2014-2025 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
+    "definitions": {
+        "JobDocumentCollection": {
+            "anyOf": [
+                {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/idRef"
+                },
+                {
+                    "additionalProperties": false,
+                    "description": "The collection of `JobDocument` resource instances.",
+                    "longDescription": "This resource shall represent a resource collection of `JobDocument` instances for a Redfish implementation.",
+                    "patternProperties": {
+                        "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                            "description": "This property shall specify a valid odata or Redfish property.",
+                            "type": [
+                                "array",
+                                "boolean",
+                                "integer",
+                                "number",
+                                "null",
+                                "object",
+                                "string"
+                            ]
+                        }
+                    },
+                    "properties": {
+                        "@odata.context": {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/context"
+                        },
+                        "@odata.etag": {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/etag"
+                        },
+                        "@odata.id": {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/id"
+                        },
+                        "@odata.type": {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/type"
+                        },
+                        "Description": {
+                            "anyOf": [
+                                {
+                                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Description"
+                                },
+                                {
+                                    "type": "null"
+                                }
+                            ],
+                            "readonly": true
+                        },
+                        "Members": {
+                            "description": "The members of this collection.",
+                            "items": {
+                                "$ref": "http://redfish.dmtf.org/schemas/v1/JobDocument.json#/definitions/JobDocument"
+                            },
+                            "longDescription": "This property shall contain an array of links to the members of this collection.",
+                            "readonly": true,
+                            "type": "array"
+                        },
+                        "Members@odata.count": {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
+                        },
+                        "Members@odata.nextLink": {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/nextLink"
+                        },
+                        "Name": {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Name",
+                            "readonly": true
+                        },
+                        "Oem": {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Oem",
+                            "description": "The OEM extension property.",
+                            "longDescription": "This property shall contain the OEM extensions.  All values for properties contained in this object shall conform to the Redfish Specification-described requirements."
+                        }
+                    },
+                    "required": [
+                        "Members",
+                        "Members@odata.count",
+                        "@odata.id",
+                        "@odata.type",
+                        "Name"
+                    ],
+                    "type": "object"
+                }
+            ],
+            "deletable": false,
+            "insertable": true,
+            "updatable": false,
+            "uris": [
+                "/redfish/v1/JobService/Documents"
+            ]
+        }
+    },
+    "language": "en",
+    "owningEntity": "DMTF",
+    "title": "#JobDocumentCollection.JobDocumentCollection"
+}
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/JobService.v1_0_6.json b/redfish-core/schema/dmtf/json-schema/JobExecutor.v1_0_0.json
similarity index 66%
copy from redfish-core/schema/dmtf/json-schema/JobService.v1_0_6.json
copy to redfish-core/schema/dmtf/json-schema/JobExecutor.v1_0_0.json
index e7ab95f..99af514 100644
--- a/redfish-core/schema/dmtf/json-schema/JobService.v1_0_6.json
+++ b/redfish-core/schema/dmtf/json-schema/JobExecutor.v1_0_0.json
@@ -1,8 +1,8 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/JobService.v1_0_6.json",
-    "$ref": "#/definitions/JobService",
+    "$id": "http://redfish.dmtf.org/schemas/v1/JobExecutor.v1_0_0.json",
+    "$ref": "#/definitions/JobExecutor",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
-    "copyright": "Copyright 2014-2024 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
+    "copyright": "Copyright 2014-2025 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
     "definitions": {
         "Actions": {
             "additionalProperties": false,
@@ -31,10 +31,10 @@
             },
             "type": "object"
         },
-        "JobService": {
+        "JobExecutor": {
             "additionalProperties": false,
-            "description": "The `JobService` schema contains properties for scheduling and execution of operations, represents the properties for the job service itself, and has links to jobs managed by the job service.",
-            "longDescription": "This resource shall represent a job service for a Redfish implementation.",
+            "description": "The `JobExecutor` schema describes an entity that carries out a job.",
+            "longDescription": "This resource shall represent a job executor for a Redfish implementation.",
             "patternProperties": {
                 "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
                     "description": "This property shall specify a valid odata or Redfish property.",
@@ -67,16 +67,6 @@
                     "description": "The available actions for this resource.",
                     "longDescription": "This property shall contain the available actions for this resource."
                 },
-                "DateTime": {
-                    "description": "The current date and time setting for the job service.",
-                    "format": "date-time",
-                    "longDescription": "This property shall contain the current date and time setting for the job service.",
-                    "readonly": true,
-                    "type": [
-                        "string",
-                        "null"
-                    ]
-                },
                 "Description": {
                     "anyOf": [
                         {
@@ -88,21 +78,26 @@
                     ],
                     "readonly": true
                 },
+                "ExecutorType": {
+                    "description": "The primary type of job this executor processes.",
+                    "longDescription": "This property shall contain the primary type of job executed by this resource.",
+                    "readonly": true,
+                    "type": "string"
+                },
                 "Id": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Id",
                     "readonly": true
                 },
-                "Jobs": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/JobCollection.json#/definitions/JobCollection",
-                    "description": "The links to the jobs collection.",
-                    "longDescription": "This property shall contain a link to a resource collection of type `JobCollection`.",
-                    "readonly": true
+                "Links": {
+                    "$ref": "#/definitions/Links",
+                    "description": "The links to other resources that are related to this resource.",
+                    "longDescription": "This property shall contain links to resources that are related to but are not contained by, or subordinate to, this resource."
                 },
-                "Log": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/LogService.json#/definitions/LogService",
-                    "description": "The link to a log service that the job service uses.  This service can be a dedicated log service or a pointer to a log service under another resource, such as a manager.",
-                    "longDescription": "This property shall contain a link to a resource of type `LogService` that this job service uses.",
-                    "readonly": true
+                "MaximumConcurrentJobs": {
+                    "description": "The maximum concurrent jobs this executor can process.",
+                    "longDescription": "This property shall contain the maximum concurrent jobs this executor can process.",
+                    "readonly": true,
+                    "type": "integer"
                 },
                 "Name": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Name",
@@ -113,20 +108,6 @@
                     "description": "The OEM extension property.",
                     "longDescription": "This property shall contain the OEM extensions.  All values for properties that this object contains shall conform to the Redfish Specification-described requirements."
                 },
-                "ServiceCapabilities": {
-                    "$ref": "#/definitions/JobServiceCapabilities",
-                    "description": "The supported capabilities of this job service implementation.",
-                    "longDescription": "This type shall contain properties that describe the capabilities or supported features of this implementation of a job service."
-                },
-                "ServiceEnabled": {
-                    "description": "An indication of whether this service is enabled.",
-                    "longDescription": "This property shall indicate whether this service is enabled.",
-                    "readonly": false,
-                    "type": [
-                        "boolean",
-                        "null"
-                    ]
-                },
                 "Status": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Status",
                     "description": "The status and health of the resource and its subordinate or dependent resources.",
@@ -141,10 +122,10 @@
             ],
             "type": "object"
         },
-        "JobServiceCapabilities": {
+        "Links": {
             "additionalProperties": false,
-            "description": "The supported capabilities of this job service implementation.",
-            "longDescription": "This type shall contain properties that describe the capabilities or supported features of this implementation of a job service.",
+            "description": "The links to other resources that are related to this resource.",
+            "longDescription": "This Redfish Specification-described type shall contain links to resources that are related to but are not contained by, or subordinate to, this resource.",
             "patternProperties": {
                 "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
                     "description": "This property shall specify a valid odata or Redfish property.",
@@ -160,32 +141,35 @@
                 }
             },
             "properties": {
-                "MaxJobs": {
-                    "description": "The maximum number of jobs supported.",
-                    "longDescription": "This property shall contain the maximum number of jobs supported by the implementation.",
+                "Chassis": {
+                    "description": "An array of links to the chassis that contain this equipment.",
+                    "items": {
+                        "$ref": "http://redfish.dmtf.org/schemas/v1/Chassis.json#/definitions/Chassis"
+                    },
+                    "longDescription": "This property shall contain an array of links to resources of type `Chassis` that represent the physical containers that contain this equipment.",
                     "readonly": true,
-                    "type": [
-                        "integer",
-                        "null"
-                    ]
+                    "type": "array"
                 },
-                "MaxSteps": {
-                    "description": "The maximum number of job steps supported.",
-                    "longDescription": "This property shall contain the maximum number of steps supported by a single job instance.",
-                    "readonly": true,
-                    "type": [
-                        "integer",
-                        "null"
-                    ]
+                "Chassis@odata.count": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
                 },
-                "Scheduling": {
-                    "description": "An indication of whether scheduling of jobs is supported.",
-                    "longDescription": "This property shall indicate whether the `Schedule` property within the job supports scheduling of jobs.",
+                "ComputerSystem": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/ComputerSystem.json#/definitions/ComputerSystem",
+                    "description": "The system that is performing the work of this job executor.",
+                    "longDescription": "This property shall contain a link to a resource of type `ComputerSystem` that represents the system that is performing the work of this job executor.",
+                    "readonly": true
+                },
+                "ExecutingJobs": {
+                    "description": "Links to jobs this executor is running.",
+                    "items": {
+                        "$ref": "http://redfish.dmtf.org/schemas/v1/Job.json#/definitions/Job"
+                    },
+                    "longDescription": "This property shall contain an array of links to resources of type `Job` that represent the jobs this executor is running.",
                     "readonly": true,
-                    "type": [
-                        "boolean",
-                        "null"
-                    ]
+                    "type": "array"
+                },
+                "ExecutingJobs@odata.count": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
                 }
             },
             "type": "object"
@@ -214,6 +198,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2018.2",
-    "title": "#JobService.v1_0_6.JobService"
+    "release": "2025.2",
+    "title": "#JobExecutor.v1_0_0.JobExecutor"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/JobExecutorCollection.json b/redfish-core/schema/dmtf/json-schema/JobExecutorCollection.json
new file mode 100644
index 0000000..75ac93d
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema/JobExecutorCollection.json
@@ -0,0 +1,100 @@
+{
+    "$id": "http://redfish.dmtf.org/schemas/v1/JobExecutorCollection.json",
+    "$ref": "#/definitions/JobExecutorCollection",
+    "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
+    "copyright": "Copyright 2014-2025 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
+    "definitions": {
+        "JobExecutorCollection": {
+            "anyOf": [
+                {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/idRef"
+                },
+                {
+                    "additionalProperties": false,
+                    "description": "The collection of `JobExecutor` resource instances.",
+                    "longDescription": "This resource shall represent a resource collection of `JobExecutor` instances for a Redfish implementation.",
+                    "patternProperties": {
+                        "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                            "description": "This property shall specify a valid odata or Redfish property.",
+                            "type": [
+                                "array",
+                                "boolean",
+                                "integer",
+                                "number",
+                                "null",
+                                "object",
+                                "string"
+                            ]
+                        }
+                    },
+                    "properties": {
+                        "@odata.context": {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/context"
+                        },
+                        "@odata.etag": {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/etag"
+                        },
+                        "@odata.id": {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/id"
+                        },
+                        "@odata.type": {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/type"
+                        },
+                        "Description": {
+                            "anyOf": [
+                                {
+                                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Description"
+                                },
+                                {
+                                    "type": "null"
+                                }
+                            ],
+                            "readonly": true
+                        },
+                        "Members": {
+                            "description": "The members of this collection.",
+                            "items": {
+                                "$ref": "http://redfish.dmtf.org/schemas/v1/JobExecutor.json#/definitions/JobExecutor"
+                            },
+                            "longDescription": "This property shall contain an array of links to the members of this collection.",
+                            "readonly": true,
+                            "type": "array"
+                        },
+                        "Members@odata.count": {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
+                        },
+                        "Members@odata.nextLink": {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/nextLink"
+                        },
+                        "Name": {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Name",
+                            "readonly": true
+                        },
+                        "Oem": {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Oem",
+                            "description": "The OEM extension property.",
+                            "longDescription": "This property shall contain the OEM extensions.  All values for properties contained in this object shall conform to the Redfish Specification-described requirements."
+                        }
+                    },
+                    "required": [
+                        "Members",
+                        "Members@odata.count",
+                        "@odata.id",
+                        "@odata.type",
+                        "Name"
+                    ],
+                    "type": "object"
+                }
+            ],
+            "deletable": false,
+            "insertable": true,
+            "updatable": false,
+            "uris": [
+                "/redfish/v1/JobService/Executors"
+            ]
+        }
+    },
+    "language": "en",
+    "owningEntity": "DMTF",
+    "title": "#JobExecutorCollection.JobExecutorCollection"
+}
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/JobService.v1_0_6.json b/redfish-core/schema/dmtf/json-schema/JobService.v1_1_0.json
similarity index 62%
copy from redfish-core/schema/dmtf/json-schema/JobService.v1_0_6.json
copy to redfish-core/schema/dmtf/json-schema/JobService.v1_1_0.json
index e7ab95f..b26ffca 100644
--- a/redfish-core/schema/dmtf/json-schema/JobService.v1_0_6.json
+++ b/redfish-core/schema/dmtf/json-schema/JobService.v1_1_0.json
@@ -1,8 +1,8 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/JobService.v1_0_6.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/JobService.v1_1_0.json",
     "$ref": "#/definitions/JobService",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
-    "copyright": "Copyright 2014-2024 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
+    "copyright": "Copyright 2014-2025 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
     "definitions": {
         "Actions": {
             "additionalProperties": false,
@@ -23,6 +23,9 @@
                 }
             },
             "properties": {
+                "#JobService.CancelAllJobs": {
+                    "$ref": "#/definitions/CancelAllJobs"
+                },
                 "Oem": {
                     "$ref": "#/definitions/OemActions",
                     "description": "The available OEM-specific actions for this resource.",
@@ -31,6 +34,39 @@
             },
             "type": "object"
         },
+        "CancelAllJobs": {
+            "additionalProperties": false,
+            "description": "Cancels all jobs.",
+            "longDescription": "This action shall cancel all jobs.  The service shall transition all jobs to the `Cancelled` state.",
+            "parameters": {},
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "target": {
+                    "description": "Link to invoke action",
+                    "format": "uri-reference",
+                    "type": "string"
+                },
+                "title": {
+                    "description": "Friendly action name",
+                    "type": "string"
+                }
+            },
+            "type": "object",
+            "versionAdded": "v1_1_0"
+        },
         "JobService": {
             "additionalProperties": false,
             "description": "The `JobService` schema contains properties for scheduling and execution of operations, represents the properties for the job service itself, and has links to jobs managed by the job service.",
@@ -92,6 +128,20 @@
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Id",
                     "readonly": true
                 },
+                "JobDocuments": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/JobDocumentCollection.json#/definitions/JobDocumentCollection",
+                    "description": "The links to the job document collection.",
+                    "longDescription": "This property shall contain a link to a resource collection of type `JobDocumentCollection`.  This property shall only be present if the service supports document-based jobs.",
+                    "readonly": true,
+                    "versionAdded": "v1_1_0"
+                },
+                "JobExecutors": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/JobExecutorCollection.json#/definitions/JobExecutorCollection",
+                    "description": "The links to the job executor collection.",
+                    "longDescription": "This property shall contain a link to a resource collection of type `JobExecutorCollection`.  This property shall only be present if the service supports document-based jobs.",
+                    "readonly": true,
+                    "versionAdded": "v1_1_0"
+                },
                 "Jobs": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/JobCollection.json#/definitions/JobCollection",
                     "description": "The links to the jobs collection.",
@@ -116,7 +166,7 @@
                 "ServiceCapabilities": {
                     "$ref": "#/definitions/JobServiceCapabilities",
                     "description": "The supported capabilities of this job service implementation.",
-                    "longDescription": "This type shall contain properties that describe the capabilities or supported features of this implementation of a job service."
+                    "longDescription": "This property shall contain properties that describe the capabilities or supported features of this implementation of a job service."
                 },
                 "ServiceEnabled": {
                     "description": "An indication of whether this service is enabled.",
@@ -131,6 +181,20 @@
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Status",
                     "description": "The status and health of the resource and its subordinate or dependent resources.",
                     "longDescription": "This property shall contain any status or health properties of the resource."
+                },
+                "ValidationPolicy": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/ValidationPolicy"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The policy for how document-based jobs are validated.",
+                    "longDescription": "This property shall contain policy for how document-based jobs are validated.",
+                    "readonly": true,
+                    "versionAdded": "v1_1_0"
                 }
             },
             "required": [
@@ -160,6 +224,16 @@
                 }
             },
             "properties": {
+                "DocumentBasedJobs": {
+                    "description": "An indication of whether document-based jobs are supported.",
+                    "longDescription": "This property shall indicate whether document-based jobs are supported.  Document-based jobs are jobs that are created by performing the `SubmitJob` action on a `JobDocument` resource in the `JobDocumentCollection` resource referenced by the `JobDocuments` property.",
+                    "readonly": true,
+                    "type": [
+                        "boolean",
+                        "null"
+                    ],
+                    "versionAdded": "v1_1_0"
+                },
                 "MaxJobs": {
                     "description": "The maximum number of jobs supported.",
                     "longDescription": "This property shall contain the maximum number of jobs supported by the implementation.",
@@ -186,6 +260,16 @@
                         "boolean",
                         "null"
                     ]
+                },
+                "UserSpecifiedJobs": {
+                    "description": "An indication of whether user-specified jobs are supported.",
+                    "longDescription": "This property shall indicate whether user-specified jobs are supported.  User-specified jobs are jobs that are created by performing an HTTP `POST` operation on the `JobCollection` resource referenced by the `Jobs` property.",
+                    "readonly": true,
+                    "type": [
+                        "boolean",
+                        "null"
+                    ],
+                    "versionAdded": "v1_1_0"
                 }
             },
             "type": "object"
@@ -210,10 +294,28 @@
             },
             "properties": {},
             "type": "object"
+        },
+        "ValidationPolicy": {
+            "enum": [
+                "Automatic",
+                "Manual",
+                "Bypass"
+            ],
+            "enumDescriptions": {
+                "Automatic": "Jobs are validated automatically.",
+                "Bypass": "Jobs are not validated.",
+                "Manual": "Jobs are validated manually."
+            },
+            "enumLongDescriptions": {
+                "Automatic": "This value shall indicate that jobs are validated automatically.  The `JobState` property of a new job shall contain `Validating` when created with the `SubmitJob` action from the `JobDocument` resource.",
+                "Bypass": "This value shall indicate jobs are not validated.  The `JobState` property of a new job shall contain `Pending` when created with the `SubmitJob` action from the `JobDocument` resource.",
+                "Manual": "This value shall indicate jobs are validated manually.  The `JobState` property of a new job shall contain `New` when created with the `SubmitJob` action from the `JobDocument` resource and wait for a user to perform the `Validate` action in the `Job` resource."
+            },
+            "type": "string"
         }
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2018.2",
-    "title": "#JobService.v1_0_6.JobService"
+    "release": "2025.2",
+    "title": "#JobService.v1_1_0.JobService"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/LeakDetector.v1_3_0.json b/redfish-core/schema/dmtf/json-schema/LeakDetector.v1_4_0.json
similarity index 88%
rename from redfish-core/schema/dmtf/json-schema/LeakDetector.v1_3_0.json
rename to redfish-core/schema/dmtf/json-schema/LeakDetector.v1_4_0.json
index 4092f5d..f2adba9 100644
--- a/redfish-core/schema/dmtf/json-schema/LeakDetector.v1_3_0.json
+++ b/redfish-core/schema/dmtf/json-schema/LeakDetector.v1_4_0.json
@@ -1,8 +1,8 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/LeakDetector.v1_3_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/LeakDetector.v1_4_0.json",
     "$ref": "#/definitions/LeakDetector",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
-    "copyright": "Copyright 2014-2024 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
+    "copyright": "Copyright 2014-2025 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
     "definitions": {
         "Actions": {
             "additionalProperties": false,
@@ -67,6 +67,13 @@
                     "description": "The available actions for this resource.",
                     "longDescription": "This property shall contain the available actions for this resource."
                 },
+                "CriticalReactionType": {
+                    "$ref": "#/definitions/ReactionType",
+                    "description": "The reaction to perform when a critical leak is detected.",
+                    "longDescription": "The reaction that shall be performed when the `DetectorState` property changes to `Critical`.",
+                    "readonly": false,
+                    "versionAdded": "v1_4_0"
+                },
                 "Description": {
                     "anyOf": [
                         {
@@ -188,6 +195,14 @@
                     "longDescription": "This property shall contain a description of the usage or sub-region within the equipment to which this leak detector applies.  This property generally differentiates multiple leak detectors within the same `PhysicalContext` instance.",
                     "readonly": true
                 },
+                "ReactionDelaySeconds": {
+                    "description": "The delay in seconds after a leak is detected before the selected reaction is executed.",
+                    "longDescription": "The value shall indicate the number of seconds to delay after the `DetectorState` changes before the selected reaction is executed.  If the `DetectorState` returns to `OK` prior to the delay value, the service shall not perform the reaction.",
+                    "readonly": false,
+                    "type": "integer",
+                    "units": "s",
+                    "versionAdded": "v1_4_0"
+                },
                 "SKU": {
                     "description": "The SKU of the leak detector.",
                     "longDescription": "This property shall contain the stock-keeping unit number for this leak detector.",
@@ -235,6 +250,13 @@
                     "readonly": false,
                     "type": "string",
                     "versionAdded": "v1_1_0"
+                },
+                "WarningReactionType": {
+                    "$ref": "#/definitions/ReactionType",
+                    "description": "The reaction to perform when a warning-level leak is detected.",
+                    "longDescription": "The reaction that shall be performed when the `DetectorState` property changes to `Warning`.",
+                    "readonly": false,
+                    "versionAdded": "v1_4_0"
                 }
             },
             "required": [
@@ -412,10 +434,28 @@
             },
             "properties": {},
             "type": "object"
+        },
+        "ReactionType": {
+            "enum": [
+                "None",
+                "ForceOff",
+                "GracefulShutdown"
+            ],
+            "enumDescriptions": {
+                "ForceOff": "Forcefully shut down the device, equipment, or system.",
+                "GracefulShutdown": "Gracefully shut down the device, equipment, or system.",
+                "None": "No reaction."
+            },
+            "enumLongDescriptions": {
+                "ForceOff": "This value shall indicate that the associated device, equipment, or system monitored by this leak detector is forcefully shut down when a leak is detected.",
+                "GracefulShutdown": "This value shall indicate that the associated device, equipment, or system monitored by this leak detector is gracefully shut down when a leak is detected.",
+                "None": "This value shall indicate no reaction occurs when a leak is detected."
+            },
+            "type": "string"
         }
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2024.4",
-    "title": "#LeakDetector.v1_3_0.LeakDetector"
+    "release": "2025.2",
+    "title": "#LeakDetector.v1_4_0.LeakDetector"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/LogEntry.v1_18_0.json b/redfish-core/schema/dmtf/json-schema/LogEntry.v1_19_0.json
similarity index 97%
rename from redfish-core/schema/dmtf/json-schema/LogEntry.v1_18_0.json
rename to redfish-core/schema/dmtf/json-schema/LogEntry.v1_19_0.json
index 3c7c51b..356f037 100644
--- a/redfish-core/schema/dmtf/json-schema/LogEntry.v1_18_0.json
+++ b/redfish-core/schema/dmtf/json-schema/LogEntry.v1_19_0.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/LogEntry.v1_18_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/LogEntry.v1_19_0.json",
     "$ref": "#/definitions/LogEntry",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2025 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -506,6 +506,16 @@
                     "type": "integer",
                     "versionAdded": "v1_14_0"
                 },
+                "PartNumber": {
+                    "description": "The part number associated with the source of this log entry.",
+                    "longDescription": "This property shall contain the manufacturer-provided part number for the source of this log entry.",
+                    "readonly": true,
+                    "type": [
+                        "string",
+                        "null"
+                    ],
+                    "versionAdded": "v1_19_0"
+                },
                 "Persistency": {
                     "description": "Indicates whether the log entry is persistent across a cold reset of the device.",
                     "longDescription": "This property shall indicate whether the log entry is persistent across a cold reset of the device.",
@@ -561,6 +571,16 @@
                     "longDescription": "This property shall contain the sensor type to which the log entry pertains if the entry type is `SEL`.  Table 42-3, Sensor Type Codes, in the IPMI Specification v2.0 revision 1.1 describes these enumerations.",
                     "readonly": true
                 },
+                "SerialNumber": {
+                    "description": "The serial number associated with the source of this log entry.",
+                    "longDescription": "This property shall contain a manufacturer-allocated number that identifies the source of this log entry.",
+                    "readonly": true,
+                    "type": [
+                        "string",
+                        "null"
+                    ],
+                    "versionAdded": "v1_19_0"
+                },
                 "ServiceProviderNotified": {
                     "description": "Indicates if the log entry has been sent to the service provider.",
                     "longDescription": "This property shall contain an indication if the log entry has been sent to the service provider.",
@@ -907,6 +927,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2025.1",
-    "title": "#LogEntry.v1_18_0.LogEntry"
+    "release": "2025.2",
+    "title": "#LogEntry.v1_19_0.LogEntry"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/Manager.v1_21_0.json b/redfish-core/schema/dmtf/json-schema/Manager.v1_22_0.json
similarity index 98%
rename from redfish-core/schema/dmtf/json-schema/Manager.v1_21_0.json
rename to redfish-core/schema/dmtf/json-schema/Manager.v1_22_0.json
index 8db7d0d..7df801f 100644
--- a/redfish-core/schema/dmtf/json-schema/Manager.v1_21_0.json
+++ b/redfish-core/schema/dmtf/json-schema/Manager.v1_22_0.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Manager.v1_21_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Manager.v1_22_0.json",
     "$ref": "#/definitions/Manager",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2025 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -319,6 +319,19 @@
                 "ManagerForChassis@odata.count": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
                 },
+                "ManagerForFabrics": {
+                    "description": "An array of links to the fabrics that this manager controls.",
+                    "items": {
+                        "$ref": "http://redfish.dmtf.org/schemas/v1/Fabric.json#/definitions/Fabric"
+                    },
+                    "longDescription": "This property shall contain an array of links to resources of type `Fabric` that represent the fabrics that this manager controls.",
+                    "readonly": true,
+                    "type": "array",
+                    "versionAdded": "v1_22_0"
+                },
+                "ManagerForFabrics@odata.count": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
+                },
                 "ManagerForManagers": {
                     "description": "An array of links to the managers that are managed by this manager.",
                     "items": {
@@ -894,17 +907,20 @@
                 "BMC",
                 "RackManager",
                 "AuxiliaryController",
-                "Service"
+                "Service",
+                "FabricManager"
             ],
             "enumDescriptions": {
                 "AuxiliaryController": "A controller that provides management functions for a particular subsystem or group of devices as part of a larger system.",
                 "BMC": "A controller that provides management functions for one or more computer systems.  Commonly known as a BMC (baseboard management controller).  Examples of this include a BMC dedicated to one system or a multi-host manager providing BMC capabilities to multiple systems.",
                 "EnclosureManager": "A controller that provides management functions for a chassis, group of devices, or group of systems with their own BMCs (baseboard management controllers).  An example of this is a manager that aggregates and orchestrates management functions across multiple BMCs in an enclosure.",
+                "FabricManager": "A controller that primarily monitors or manages the operation of a group of fabric attached nodes and switches.",
                 "ManagementController": "A controller that primarily monitors or manages the operation of a device or system.",
                 "RackManager": "A controller that provides management functions for a whole or part of a rack.  An example of this is a manager that aggregates and orchestrates management functions across multiple managers, such as enclosure managers and BMCs (baseboard management controllers), in a rack.",
                 "Service": "A software-based service that provides management functions."
             },
             "enumVersionAdded": {
+                "FabricManager": "v1_22_0",
                 "Service": "v1_4_0"
             },
             "type": "string"
@@ -1207,6 +1223,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2025.1",
-    "title": "#Manager.v1_21_0.Manager"
+    "release": "2025.2",
+    "title": "#Manager.v1_22_0.Manager"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/ManagerAccount.v1_13_0.json b/redfish-core/schema/dmtf/json-schema/ManagerAccount.v1_14_0.json
similarity index 99%
rename from redfish-core/schema/dmtf/json-schema/ManagerAccount.v1_13_0.json
rename to redfish-core/schema/dmtf/json-schema/ManagerAccount.v1_14_0.json
index 9a363a6..f596359 100644
--- a/redfish-core/schema/dmtf/json-schema/ManagerAccount.v1_13_0.json
+++ b/redfish-core/schema/dmtf/json-schema/ManagerAccount.v1_14_0.json
@@ -1,8 +1,8 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/ManagerAccount.v1_13_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/ManagerAccount.v1_14_0.json",
     "$ref": "#/definitions/ManagerAccount",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
-    "copyright": "Copyright 2014-2024 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
+    "copyright": "Copyright 2014-2025 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
     "definitions": {
         "Actions": {
             "additionalProperties": false,
@@ -708,6 +708,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2024.3",
-    "title": "#ManagerAccount.v1_13_0.ManagerAccount"
+    "release": "2025.2",
+    "title": "#ManagerAccount.v1_14_0.ManagerAccount"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/ManagerNetworkProtocol.v1_11_0.json b/redfish-core/schema/dmtf/json-schema/ManagerNetworkProtocol.v1_12_0.json
similarity index 89%
rename from redfish-core/schema/dmtf/json-schema/ManagerNetworkProtocol.v1_11_0.json
rename to redfish-core/schema/dmtf/json-schema/ManagerNetworkProtocol.v1_12_0.json
index ed9c776..2a9565a 100644
--- a/redfish-core/schema/dmtf/json-schema/ManagerNetworkProtocol.v1_11_0.json
+++ b/redfish-core/schema/dmtf/json-schema/ManagerNetworkProtocol.v1_12_0.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/ManagerNetworkProtocol.v1_11_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/ManagerNetworkProtocol.v1_12_0.json",
     "$ref": "#/definitions/ManagerNetworkProtocol",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2025 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -249,6 +249,12 @@
                     "description": "The settings for this manager's KVM-IP protocol support that apply to all system instances controlled by this manager.",
                     "longDescription": "This object shall contain the KVM-IP (Keyboard, Video, Mouse over IP) protocol settings for the manager.  If multiple systems are supported by this manager, these properties, if present, apply to all instances of KVM-IP controlled by this manager."
                 },
+                "Modbus": {
+                    "$ref": "#/definitions/ModbusProtocol",
+                    "description": "The settings for this manager's Modbus TCP protocol support.",
+                    "longDescription": "This object shall contain the Modbus TCP protocol settings for the manager.",
+                    "versionAdded": "v1_12_0"
+                },
                 "NTP": {
                     "$ref": "#/definitions/NTPProtocol",
                     "description": "The settings for this manager's NTP protocol support.",
@@ -333,6 +339,114 @@
             ],
             "type": "object"
         },
+        "ModbusProtocol": {
+            "additionalProperties": false,
+            "description": "The settings for a network protocol associated with a manager.",
+            "longDescription": "This type shall describe information about a protocol setting for a manager.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "AllowedClients": {
+                    "description": "Indicates the list of allowed clients for this Modbus TCP server interface.",
+                    "items": {
+                        "type": [
+                            "string",
+                            "null"
+                        ]
+                    },
+                    "longDescription": "This property shall contain all the clients allowed to access this Modbus TCP server interface.  If `RestrictAccessToAllowedClients` contains `true`, the service shall enforce this restriction.  If `RestrictAccessToAllowedClients` contains `false`, the service shall not enforce this restriction.  This property may contain FQDN, IPv4 addresses, IPv6 addresses, or any combination of those formats.  Services may reject unsupported formats.",
+                    "readonly": false,
+                    "type": "array",
+                    "versionAdded": "v1_12_0"
+                },
+                "MaximumConnectedClients": {
+                    "description": "The maximum number of simultaneously connected clients.",
+                    "longDescription": "This property shall contain the maximum number of simultaneously connected clients to this Modbus TCP server.",
+                    "minimum": 0,
+                    "readonly": false,
+                    "type": [
+                        "integer",
+                        "null"
+                    ],
+                    "versionAdded": "v1_12_0"
+                },
+                "NumberOfConnectedClients": {
+                    "description": "The current number of connected clients.",
+                    "longDescription": "This property shall contain the current number of connected clients to this Modbus TCP server.",
+                    "minimum": 0,
+                    "readonly": true,
+                    "type": [
+                        "integer",
+                        "null"
+                    ],
+                    "versionAdded": "v1_12_0"
+                },
+                "Port": {
+                    "description": "The protocol port.",
+                    "longDescription": "This property shall contain the port assigned to the protocol.",
+                    "minimum": 0,
+                    "readonly": false,
+                    "type": [
+                        "integer",
+                        "null"
+                    ]
+                },
+                "ProtocolEnabled": {
+                    "description": "An indication of whether the protocol is enabled.",
+                    "longDescription": "This property shall indicate whether the protocol is enabled.",
+                    "readonly": false,
+                    "type": [
+                        "boolean",
+                        "null"
+                    ]
+                },
+                "ReadOnly": {
+                    "description": "Indicates if the interface is read only.",
+                    "longDescription": "This property shall indicate if the Modbus TCP server protocol interface is read only.  If `true`, the Modbus TCP server service on this manager shall reject or ignore Modbus requests that modify data.",
+                    "readonly": false,
+                    "type": [
+                        "boolean",
+                        "null"
+                    ],
+                    "versionAdded": "v1_12_0"
+                },
+                "RestrictAccessToAllowedClients": {
+                    "description": "Indicates if access to this Modbus TCP server protocol interface is restricted to allowed clients.",
+                    "longDescription": "This property shall indicate if access to the Modbus TCP server protocol interface is restricted to allowed clients.  If `true`, the Modbus TCP server service on this manager shall restrict access to the list of clients defined by the `AllowedClients` property.",
+                    "readonly": false,
+                    "type": [
+                        "boolean",
+                        "null"
+                    ],
+                    "versionAdded": "v1_12_0"
+                },
+                "ServerId": {
+                    "description": "The server identifier for this Modbus TCP protocol interface.",
+                    "longDescription": "This property shall contain the Modbus Messaging On TCP/IP Implementation Guide-defined 'Unit Identifier' that identifies this Modbus TCP protocol server.",
+                    "maximum": 255,
+                    "minimum": 0,
+                    "readonly": false,
+                    "type": [
+                        "integer",
+                        "null"
+                    ],
+                    "versionAdded": "v1_12_0"
+                }
+            },
+            "type": "object"
+        },
         "NTPProtocol": {
             "additionalProperties": false,
             "description": "The settings for a network protocol associated with a manager.",
@@ -974,6 +1088,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2025.1",
-    "title": "#ManagerNetworkProtocol.v1_11_0.ManagerNetworkProtocol"
+    "release": "2025.2",
+    "title": "#ManagerNetworkProtocol.v1_12_0.ManagerNetworkProtocol"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/Memory.v1_20_0.json b/redfish-core/schema/dmtf/json-schema/Memory.v1_21_0.json
similarity index 99%
rename from redfish-core/schema/dmtf/json-schema/Memory.v1_20_0.json
rename to redfish-core/schema/dmtf/json-schema/Memory.v1_21_0.json
index d15c699..20db339 100644
--- a/redfish-core/schema/dmtf/json-schema/Memory.v1_20_0.json
+++ b/redfish-core/schema/dmtf/json-schema/Memory.v1_21_0.json
@@ -1,8 +1,8 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Memory.v1_20_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Memory.v1_21_0.json",
     "$ref": "#/definitions/Memory",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
-    "copyright": "Copyright 2014-2024 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
+    "copyright": "Copyright 2014-2025 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
     "definitions": {
         "Actions": {
             "additionalProperties": false,
@@ -79,9 +79,11 @@
                 "SO_UDIMM_72b",
                 "SO_DIMM_16b",
                 "SO_DIMM_32b",
-                "Die"
+                "Die",
+                "CAMM"
             ],
             "enumDescriptions": {
+                "CAMM": "Compression Attached Memory Module.",
                 "Die": "A die within a package.",
                 "LRDIMM": "Load Reduced.",
                 "Mini_RDIMM": "Mini_RDIMM.",
@@ -95,6 +97,7 @@
                 "UDIMM": "UDIMM."
             },
             "enumVersionAdded": {
+                "CAMM": "v1_21_0",
                 "Die": "v1_7_0"
             },
             "type": "string"
@@ -1259,7 +1262,8 @@
                 "GDDR6",
                 "DDR5",
                 "OEM",
-                "LPDDR5_SDRAM"
+                "LPDDR5_SDRAM",
+                "DDR5_MRDIMM"
             ],
             "enumDescriptions": {
                 "DDR": "DDR.",
@@ -1273,6 +1277,7 @@
                 "DDR4E_SDRAM": "DDR4E SDRAM.",
                 "DDR4_SDRAM": "DDR4 SDRAM.",
                 "DDR5": "Double data rate type five synchronous dynamic random-access memory.",
+                "DDR5_MRDIMM": "DDR5 MRDIMM.",
                 "DDR_SDRAM": "DDR SDRAM.",
                 "DDR_SGRAM": "DDR SGRAM.",
                 "EDO": "EDO.",
@@ -1299,6 +1304,7 @@
             },
             "enumVersionAdded": {
                 "DDR5": "v1_11_0",
+                "DDR5_MRDIMM": "v1_21_0",
                 "GDDR": "v1_11_0",
                 "GDDR2": "v1_11_0",
                 "GDDR3": "v1_11_0",
@@ -2117,6 +2123,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2024.1",
-    "title": "#Memory.v1_20_0.Memory"
+    "release": "2025.2",
+    "title": "#Memory.v1_21_0.Memory"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/MetricDefinition.v1_3_4.json b/redfish-core/schema/dmtf/json-schema/MetricDefinition.v1_3_5.json
similarity index 98%
rename from redfish-core/schema/dmtf/json-schema/MetricDefinition.v1_3_4.json
rename to redfish-core/schema/dmtf/json-schema/MetricDefinition.v1_3_5.json
index f4de345..70e95ea 100644
--- a/redfish-core/schema/dmtf/json-schema/MetricDefinition.v1_3_4.json
+++ b/redfish-core/schema/dmtf/json-schema/MetricDefinition.v1_3_5.json
@@ -1,8 +1,8 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/MetricDefinition.v1_3_4.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/MetricDefinition.v1_3_5.json",
     "$ref": "#/definitions/MetricDefinition",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
-    "copyright": "Copyright 2014-2024 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
+    "copyright": "Copyright 2014-2025 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
     "definitions": {
         "Actions": {
             "additionalProperties": false,
@@ -531,14 +531,14 @@
                     ]
                 },
                 "Values": {
-                    "description": "An array of values to substitute for the wildcard.",
+                    "description": "An array of values to substitute for the wildcard.  `*` indicates all possible values for the wildcard.",
                     "items": {
                         "type": [
                             "string",
                             "null"
                         ]
                     },
-                    "longDescription": "This property shall contain the list of values to substitute for the wildcard.",
+                    "longDescription": "This property shall contain the list of values to substitute for the wildcard.  The value `*` shall indicate all possible values for the wildcard.",
                     "readonly": true,
                     "type": "array"
                 }
@@ -549,5 +549,5 @@
     "language": "en",
     "owningEntity": "DMTF",
     "release": "2022.1",
-    "title": "#MetricDefinition.v1_3_4.MetricDefinition"
+    "title": "#MetricDefinition.v1_3_5.MetricDefinition"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/MetricReportDefinition.v1_4_6.json b/redfish-core/schema/dmtf/json-schema/MetricReportDefinition.v1_4_7.json
similarity index 98%
rename from redfish-core/schema/dmtf/json-schema/MetricReportDefinition.v1_4_6.json
rename to redfish-core/schema/dmtf/json-schema/MetricReportDefinition.v1_4_7.json
index c77d4d8..89d36c8 100644
--- a/redfish-core/schema/dmtf/json-schema/MetricReportDefinition.v1_4_6.json
+++ b/redfish-core/schema/dmtf/json-schema/MetricReportDefinition.v1_4_7.json
@@ -1,8 +1,8 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/MetricReportDefinition.v1_4_6.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/MetricReportDefinition.v1_4_7.json",
     "$ref": "#/definitions/MetricReportDefinition",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
-    "copyright": "Copyright 2014-2024 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
+    "copyright": "Copyright 2014-2025 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
     "definitions": {
         "Actions": {
             "additionalProperties": false,
@@ -516,14 +516,14 @@
                     ]
                 },
                 "Values": {
-                    "description": "An array of values to substitute for the wildcard.",
+                    "description": "An array of values to substitute for the wildcard.  `*` indicates all possible values for the wildcard.",
                     "items": {
                         "type": [
                             "string",
                             "null"
                         ]
                     },
-                    "longDescription": "This property shall contain the list of values to substitute for the wildcard.",
+                    "longDescription": "This property shall contain the list of values to substitute for the wildcard.  The value `*` shall indicate all possible values for the wildcard.",
                     "readonly": false,
                     "type": "array",
                     "versionAdded": "v1_1_0"
@@ -535,5 +535,5 @@
     "language": "en",
     "owningEntity": "DMTF",
     "release": "2020.4",
-    "title": "#MetricReportDefinition.v1_4_6.MetricReportDefinition"
+    "title": "#MetricReportDefinition.v1_4_7.MetricReportDefinition"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/NetworkAdapter.v1_11_0.json b/redfish-core/schema/dmtf/json-schema/NetworkAdapter.v1_12_1.json
similarity index 97%
rename from redfish-core/schema/dmtf/json-schema/NetworkAdapter.v1_11_0.json
rename to redfish-core/schema/dmtf/json-schema/NetworkAdapter.v1_12_1.json
index c427fa2..da554eb 100644
--- a/redfish-core/schema/dmtf/json-schema/NetworkAdapter.v1_11_0.json
+++ b/redfish-core/schema/dmtf/json-schema/NetworkAdapter.v1_12_1.json
@@ -1,8 +1,8 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/NetworkAdapter.v1_11_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/NetworkAdapter.v1_12_1.json",
     "$ref": "#/definitions/NetworkAdapter",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
-    "copyright": "Copyright 2014-2024 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
+    "copyright": "Copyright 2014-2025 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
     "definitions": {
         "Actions": {
             "additionalProperties": false,
@@ -332,7 +332,7 @@
         "NetworkAdapter": {
             "additionalProperties": false,
             "description": "The `NetworkAdapter` schema represents a physical network adapter capable of connecting to a computer network.  Examples include but are not limited to Ethernet, Fibre Channel, and converged network adapters.",
-            "longDescription": "This resource shall represent a physical network adapter capable of connecting to a computer network in a Redfish implementation.",
+            "longDescription": "This resource shall represent a physical network adapter capable of connecting to a computer network in a Redfish implementation.  Services should represent adapters that contain multiple controllers with independent management interfaces as multiple `NetworkAdapter` resources.",
             "patternProperties": {
                 "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
                     "description": "This property shall specify a valid odata or Redfish property.",
@@ -705,6 +705,13 @@
                 }
             },
             "properties": {
+                "SRIOVEnabled": {
+                    "description": "An indication of whether single root input/output virtualization (SR-IOV) is enabled for this controller.",
+                    "longDescription": "This property shall indicate whether single root input/output virtualization (SR-IOV) is enabled for this controller.",
+                    "readonly": false,
+                    "type": "boolean",
+                    "versionAdded": "v1_12_0"
+                },
                 "SRIOVVEPACapable": {
                     "description": "An indication of whether this controller supports single root input/output virtualization (SR-IOV) in Virtual Ethernet Port Aggregator (VEPA) mode.",
                     "longDescription": "This property shall indicate whether this controller supports single root input/output virtualization (SR-IOV) in Virtual Ethernet Port Aggregator (VEPA) mode.",
@@ -801,6 +808,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2024.1",
-    "title": "#NetworkAdapter.v1_11_0.NetworkAdapter"
+    "release": "2025.2",
+    "title": "#NetworkAdapter.v1_12_1.NetworkAdapter"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/NetworkDeviceFunction.v1_10_0.json b/redfish-core/schema/dmtf/json-schema/NetworkDeviceFunction.v1_11_0.json
similarity index 98%
rename from redfish-core/schema/dmtf/json-schema/NetworkDeviceFunction.v1_10_0.json
rename to redfish-core/schema/dmtf/json-schema/NetworkDeviceFunction.v1_11_0.json
index 7b70dab..821bc04 100644
--- a/redfish-core/schema/dmtf/json-schema/NetworkDeviceFunction.v1_10_0.json
+++ b/redfish-core/schema/dmtf/json-schema/NetworkDeviceFunction.v1_11_0.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/NetworkDeviceFunction.v1_10_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/NetworkDeviceFunction.v1_11_0.json",
     "$ref": "#/definitions/NetworkDeviceFunction",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2025 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -934,6 +934,13 @@
                     "description": "The status and health of the resource and its subordinate or dependent resources.",
                     "longDescription": "This property shall contain any status or health properties of the resource."
                 },
+                "VirtualFunctionAllocation": {
+                    "description": "The number of virtual functions allocated to this device.",
+                    "longDescription": "This property shall contain the number virtual functions allocated to this device.  This property should contain a value that is a multiple of the value contained by the `MinAssignmentGroupSize` property of the corresponding `Controllers` array member within the parent `NetworkAdapter` resource.  The value shall not exceed the value contained in the `MaxVirtualFunctions` property.",
+                    "readonly": false,
+                    "type": "integer",
+                    "versionAdded": "v1_11_0"
+                },
                 "VirtualFunctionsEnabled": {
                     "description": "An indication of whether single root input/output virtualization (SR-IOV) virtual functions are enabled for this network device function.",
                     "longDescription": "This property shall indicate whether single root input/output virtualization (SR-IOV) virtual functions are enabled for this network device function.",
@@ -1291,6 +1298,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2025.1",
-    "title": "#NetworkDeviceFunction.v1_10_0.NetworkDeviceFunction"
+    "release": "2025.2",
+    "title": "#NetworkDeviceFunction.v1_11_0.NetworkDeviceFunction"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/PCIeDevice.v1_18_0.json b/redfish-core/schema/dmtf/json-schema/PCIeDevice.v1_19_0.json
similarity index 98%
rename from redfish-core/schema/dmtf/json-schema/PCIeDevice.v1_18_0.json
rename to redfish-core/schema/dmtf/json-schema/PCIeDevice.v1_19_0.json
index 653308a..18e4ed8 100644
--- a/redfish-core/schema/dmtf/json-schema/PCIeDevice.v1_18_0.json
+++ b/redfish-core/schema/dmtf/json-schema/PCIeDevice.v1_19_0.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/PCIeDevice.v1_18_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/PCIeDevice.v1_19_0.json",
     "$ref": "#/definitions/PCIeDevice",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2025 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -497,6 +497,19 @@
                 "Chassis@odata.count": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
                 },
+                "ConnectedPCIePorts": {
+                    "description": "An array of links to the remote PCIe ports to which this device is connected.",
+                    "items": {
+                        "$ref": "http://redfish.dmtf.org/schemas/v1/Port.json#/definitions/Port"
+                    },
+                    "longDescription": "This property shall contain an array of links to resources of type `Port` that represent the remote PCIe ports to which this device is connected.",
+                    "readonly": true,
+                    "type": "array",
+                    "versionAdded": "v1_19_0"
+                },
+                "ConnectedPCIePorts@odata.count": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
+                },
                 "Oem": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Oem",
                     "description": "The OEM extension property.",
@@ -1161,6 +1174,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2025.1",
-    "title": "#PCIeDevice.v1_18_0.PCIeDevice"
+    "release": "2025.2",
+    "title": "#PCIeDevice.v1_19_0.PCIeDevice"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/PortCollection.json b/redfish-core/schema/dmtf/json-schema/PortCollection.json
index e74c733..21803bf 100644
--- a/redfish-core/schema/dmtf/json-schema/PortCollection.json
+++ b/redfish-core/schema/dmtf/json-schema/PortCollection.json
@@ -95,8 +95,8 @@
                 "/redfish/v1/Systems/{ComputerSystemId}/Storage/{StorageId}/Controllers/{StorageControllerId}/Ports",
                 "/redfish/v1/Systems/{ComputerSystemId}/FabricAdapters/{FabricAdapterId}/Ports",
                 "/redfish/v1/Systems/{ComputerSystemId}/NetworkInterfaces/{NetworkInterfaceId}/Ports",
-                "/redfish/v1/Systems/{ComputerSystemId}/GraphicsControllers/{ControllerId}/Ports",
-                "/redfish/v1/Systems/{ComputerSystemId}/USBControllers/{ControllerId}/Ports",
+                "/redfish/v1/Systems/{ComputerSystemId}/GraphicsControllers/{GraphicsControllerId}/Ports",
+                "/redfish/v1/Systems/{ComputerSystemId}/USBControllers/{USBControllerId}/Ports",
                 "/redfish/v1/Systems/{ComputerSystemId}/Processors/{ProcessorId}/Ports",
                 "/redfish/v1/Chassis/{ChassisId}/MediaControllers/{MediaControllerId}/Ports",
                 "/redfish/v1/Chassis/{ChassisId}/FabricAdapters/{FabricAdapterId}/Ports",
@@ -109,8 +109,8 @@
                 "/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/Controllers/{StorageControllerId}/Ports",
                 "/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/FabricAdapters/{FabricAdapterId}/Ports",
                 "/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/NetworkInterfaces/{NetworkInterfaceId}/Ports",
-                "/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/GraphicsControllers/{ControllerId}/Ports",
-                "/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/USBControllers/{ControllerId}/Ports",
+                "/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/GraphicsControllers/{GraphicsControllerId}/Ports",
+                "/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/USBControllers/{USBControllerId}/Ports",
                 "/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Processors/{ProcessorId}/Ports",
                 "/redfish/v1/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/StorageControllers/{StorageControllerId}/Ports",
                 "/redfish/v1/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/Controllers/{StorageControllerId}/Ports",
@@ -120,8 +120,8 @@
                 "/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/Controllers/{StorageControllerId}/Ports",
                 "/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/FabricAdapters/{FabricAdapterId}/Ports",
                 "/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/NetworkInterfaces/{NetworkInterfaceId}/Ports",
-                "/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/GraphicsControllers/{ControllerId}/Ports",
-                "/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/USBControllers/{ControllerId}/Ports",
+                "/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/GraphicsControllers/{GraphicsControllerId}/Ports",
+                "/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/USBControllers/{USBControllerId}/Ports",
                 "/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Processors/{ProcessorId}/Ports",
                 "/redfish/v1/Storage/{StorageId}/StorageControllers/{StorageControllerId}/Ports",
                 "/redfish/v1/Storage/{StorageId}/Controllers/{StorageControllerId}/Ports",
diff --git a/redfish-core/schema/dmtf/json-schema/Protocol.json b/redfish-core/schema/dmtf/json-schema/Protocol.json
index e31205b..241380a 100644
--- a/redfish-core/schema/dmtf/json-schema/Protocol.json
+++ b/redfish-core/schema/dmtf/json-schema/Protocol.json
@@ -46,7 +46,7 @@
                 "UPI",
                 "QPI",
                 "eMMC",
-                "UEC"
+                "UET"
             ],
             "enumDescriptions": {
                 "AHCI": "Advanced Host Controller Interface (AHCI).",
@@ -83,7 +83,7 @@
                 "TCP": "Transmission Control Protocol (TCP).",
                 "TFTP": "Trivial File Transfer Protocol (TFTP).",
                 "UDP": "User Datagram Protocol (UDP).",
-                "UEC": "Ultra Ethernet (UEC).",
+                "UET": "Ultra Ethernet Transport.",
                 "UHCI": "Universal Host Controller Interface (UHCI).",
                 "UPI": "Intel UltraPath Interconnect (UPI).",
                 "USB": "Universal Serial Bus (USB).",
@@ -126,7 +126,7 @@
                 "TCP": "This value shall indicate conformance to the IETF-defined Transmission Control Protocol (TCP).  For example, RFC7414 defines the roadmap of the TCP specification.",
                 "TFTP": "This value shall indicate conformance to the IETF-defined Trivial File Transfer Protocol (TFTP).  For example, RFC1350 defines the core TFTP version 2 specification.",
                 "UDP": "This value shall indicate conformance to the IETF-defined User Datagram Protocol (UDP).  For example, RFC768 defines the core UDP specification.",
-                "UEC": "This value shall indicate conformance to the Ultra Ethernet specifications.",
+                "UET": "This value shall indicate conformance to the Ultra Ethernet specifications.",
                 "UHCI": "This value shall indicate conformance to the Intel Universal Host Controller Interface (UHCI) Specification, Enhanced Host Controller Interface Specification, or the Extensible Host Controller Interface Specification.",
                 "UPI": "This value shall indicate conformance to the Intel UltraPath Interconnect (UPI) protocol.",
                 "USB": "This value shall indicate conformance to the USB Implementers Forum Universal Serial Bus Specification.",
@@ -155,7 +155,7 @@
                 "TCP": "2019.3",
                 "TFTP": "2019.3",
                 "UDP": "2019.3",
-                "UEC": "2025.1",
+                "UET": "2025.1",
                 "UPI": "2023.2",
                 "VGA": "2021.1",
                 "eMMC": "2024.1",
diff --git a/redfish-core/schema/dmtf/json-schema/PumpCollection.json b/redfish-core/schema/dmtf/json-schema/PumpCollection.json
index 0e8b670..83caec2 100644
--- a/redfish-core/schema/dmtf/json-schema/PumpCollection.json
+++ b/redfish-core/schema/dmtf/json-schema/PumpCollection.json
@@ -93,6 +93,7 @@
                 "/redfish/v1/ThermalEquipment/CDUs/{CoolingUnitId}/Pumps",
                 "/redfish/v1/ThermalEquipment/ImmersionUnits/{CoolingUnitId}/Pumps",
                 "/redfish/v1/ThermalEquipment/HeatExchangers/{CoolingUnitId}/Pumps",
+                "/redfish/v1/ThermalEquipment/RPUs/{CoolingUnitId}/Pumps",
                 "/redfish/v1/Chassis/{ChassisId}/ThermalSubsystem/Pumps"
             ]
         }
diff --git a/redfish-core/schema/dmtf/json-schema/ReservoirCollection.json b/redfish-core/schema/dmtf/json-schema/ReservoirCollection.json
index 5d3851a..086c484 100644
--- a/redfish-core/schema/dmtf/json-schema/ReservoirCollection.json
+++ b/redfish-core/schema/dmtf/json-schema/ReservoirCollection.json
@@ -92,7 +92,8 @@
             "uris": [
                 "/redfish/v1/ThermalEquipment/CDUs/{CoolingUnitId}/Reservoirs",
                 "/redfish/v1/ThermalEquipment/ImmersionUnits/{CoolingUnitId}/Reservoirs",
-                "/redfish/v1/ThermalEquipment/HeatExchangers/{CoolingUnitId}/Reservoirs"
+                "/redfish/v1/ThermalEquipment/HeatExchangers/{CoolingUnitId}/Reservoirs",
+                "/redfish/v1/ThermalEquipment/RPUs/{CoolingUnitId}/Reservoirs"
             ]
         }
     },
diff --git a/redfish-core/schema/dmtf/json-schema/Resource.v1_21_0.json b/redfish-core/schema/dmtf/json-schema/Resource.v1_22_0.json
similarity index 97%
rename from redfish-core/schema/dmtf/json-schema/Resource.v1_21_0.json
rename to redfish-core/schema/dmtf/json-schema/Resource.v1_22_0.json
index 9614ce4..ad2b844 100644
--- a/redfish-core/schema/dmtf/json-schema/Resource.v1_21_0.json
+++ b/redfish-core/schema/dmtf/json-schema/Resource.v1_22_0.json
@@ -1,8 +1,26 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Resource.v1_21_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Resource.v1_22_0.json",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
-    "copyright": "Copyright 2014-2024 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
+    "copyright": "Copyright 2014-2025 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
     "definitions": {
+        "ConditionType": {
+            "enum": [
+                "Alert",
+                "Informational",
+                "Subsystem"
+            ],
+            "enumDescriptions": {
+                "Alert": "The condition is an alert.",
+                "Informational": "The condition is informational.",
+                "Subsystem": "The condition is the health of a subsystem."
+            },
+            "enumLongDescriptions": {
+                "Alert": "This value shall indicate a condition that requires correction, such as a fault.",
+                "Informational": "This value shall indicate a condition that requires attention, maintenance, or some other user intervention, such as performing a reset to activate new firmware.",
+                "Subsystem": "This value shall indicate a condition that contains the health of a subsystem.  If supported by the service, the service shall always provide this condition in responses."
+            },
+            "type": "string"
+        },
         "ContactInfo": {
             "additionalProperties": false,
             "description": "Contact information for this resource.",
@@ -1174,6 +1192,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2024.4",
-    "title": "#Resource.v1_21_0"
+    "release": "2025.2",
+    "title": "#Resource.v1_22_0"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/Sensor.v1_10_1.json b/redfish-core/schema/dmtf/json-schema/Sensor.v1_11_0.json
similarity index 97%
rename from redfish-core/schema/dmtf/json-schema/Sensor.v1_10_1.json
rename to redfish-core/schema/dmtf/json-schema/Sensor.v1_11_0.json
index 2bc2868..b3285fb 100644
--- a/redfish-core/schema/dmtf/json-schema/Sensor.v1_10_1.json
+++ b/redfish-core/schema/dmtf/json-schema/Sensor.v1_11_0.json
@@ -1,8 +1,8 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Sensor.v1_10_1.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Sensor.v1_11_0.json",
     "$ref": "#/definitions/Sensor",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
-    "copyright": "Copyright 2014-2024 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
+    "copyright": "Copyright 2014-2025 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
     "definitions": {
         "Actions": {
             "additionalProperties": false,
@@ -154,7 +154,14 @@
                 "Altitude",
                 "Percent",
                 "AbsoluteHumidity",
-                "Heat"
+                "Heat",
+                "LinearPosition",
+                "LinearVelocity",
+                "LinearAcceleration",
+                "RotationalPosition",
+                "RotationalVelocity",
+                "RotationalAcceleration",
+                "Valve"
             ],
             "enumDeprecated": {
                 "AirFlow": "This value has been deprecated in favor of `AirFlowCMM` for consistent use of SI units.",
@@ -175,6 +182,9 @@
                 "Frequency": "Frequency (Hz).",
                 "Heat": "Heat (kW).",
                 "Humidity": "Relative humidity (percent).",
+                "LinearAcceleration": "Linear acceleration (m/s^2).",
+                "LinearPosition": "Linear position or distance (m).",
+                "LinearVelocity": "Linear velocity (m/s).",
                 "LiquidFlow": "Liquid flow (L/s).",
                 "LiquidFlowLPM": "Liquid flow (L/min).",
                 "LiquidLevel": "Liquid level (cm).",
@@ -184,7 +194,11 @@
                 "PressurePa": "Pressure (Pa).",
                 "PressurekPa": "Pressure (kPa).",
                 "Rotational": "Rotational (RPM).",
+                "RotationalAcceleration": "Rotational acceleration (rad/s^2).",
+                "RotationalPosition": "Rotational position (rad).",
+                "RotationalVelocity": "Rotational velocity (rad/s).",
                 "Temperature": "Temperature (C).",
+                "Valve": "Valve (% open).",
                 "Voltage": "Voltage (VAC or VDC)."
             },
             "enumLongDescriptions": {
@@ -201,6 +215,9 @@
                 "Frequency": "This value shall indicate a frequency measurement, in hertz units.  The `ReadingUnits` property shall contain `Hz`.",
                 "Heat": "This value shall indicate a heat measurement, in kilowatt units.  The `ReadingUnits` property shall contain `kW`.",
                 "Humidity": "This value shall indicate a relative humidity measurement, in percent units.  The `ReadingUnits` property shall contain `%`.",
+                "LinearAcceleration": "This value shall indicate a linear acceleration, in meters per square second units.  The `ReadingUnits` property shall contain `m/s2`.",
+                "LinearPosition": "This value shall indicate a linear position or distance, in meter units.  The `ReadingUnits` property shall contain `m`.",
+                "LinearVelocity": "This value shall indicate a linear velocity, in meters per second units.  The `ReadingUnits` property shall contain `m/s`.",
                 "LiquidFlow": "This value shall indicate a measurement of a volume of liquid per unit of time, in liters per second units, that flows through a particular junction.  The `ReadingUnits` property shall contain `L/s`.",
                 "LiquidFlowLPM": "This value shall indicate a measurement of a volume of liquid per unit of time, in liters per minute units, that flows through a particular junction.  The `ReadingUnits` property shall contain `L/min`.",
                 "LiquidLevel": "This value shall indicate a measurement of fluid height, in centimeter units, relative to a specified vertical datum and the `ReadingUnits` property shall contain `cm`.",
@@ -210,7 +227,11 @@
                 "PressurePa": "This value shall indicate a measurement of pressure, in pascal units, relative to atmospheric pressure.  The `ReadingUnits` property shall contain `Pa`.",
                 "PressurekPa": "This value shall indicate a measurement of pressure, in kilopascal units, relative to atmospheric pressure.  The `ReadingUnits` property shall contain `kPa`.",
                 "Rotational": "This value shall indicate a measurement of rotational frequency, in revolutions per minute units.  The `ReadingUnits` property shall contain either `{rev}/min`, which is preferred, or `RPM`, which is a deprecated value.",
+                "RotationalAcceleration": "This value shall indicate a rotational acceleration, in radians per square second units.  The `ReadingUnits` property shall contain `rad/s2`.",
+                "RotationalPosition": "This value shall indicate a rotational position, in radian units.  The `ReadingUnits` property shall contain `rad`.",
+                "RotationalVelocity": "This value shall indicate a rotational velocity, in radians per second units.  The `ReadingUnits` property shall contain `rad/s`.",
                 "Temperature": "This value shall indicate a temperature measurement, in degree Celsius units.  The `ReadingUnits` property shall contain `Cel`.",
+                "Valve": "This value shall indicate a valve position, in percent units.  The `ReadingUnits` property shall contain `%`.  A value of `100` shall indicate the valve is completely open, and a value of `0` shall indicate the valve is completely closed.",
                 "Voltage": "This value shall indicate a measurement of the root mean square (RMS) of instantaneous voltage calculated over an integer number of line cycles for a circuit.  Voltage is expressed in volt units and the `ReadingUnits` property shall contain `V`."
             },
             "enumVersionAdded": {
@@ -219,10 +240,17 @@
                 "ChargeAh": "v1_4_0",
                 "EnergyWh": "v1_4_0",
                 "Heat": "v1_7_0",
+                "LinearAcceleration": "v1_11_0",
+                "LinearPosition": "v1_11_0",
+                "LinearVelocity": "v1_11_0",
                 "LiquidFlowLPM": "v1_7_0",
                 "Percent": "v1_1_0",
                 "PressurePa": "v1_7_0",
-                "PressurekPa": "v1_5_0"
+                "PressurekPa": "v1_5_0",
+                "RotationalAcceleration": "v1_11_0",
+                "RotationalPosition": "v1_11_0",
+                "RotationalVelocity": "v1_11_0",
+                "Valve": "v1_11_0"
             },
             "enumVersionDeprecated": {
                 "AirFlow": "v1_7_0",
@@ -667,7 +695,7 @@
                     "description": "The area or device to which this sensor measurement applies.",
                     "excerpt": "SensorArray,SensorFanArray,SensorPowerArray",
                     "longDescription": "This property shall contain a description of the affected component or region within the equipment to which this sensor measurement applies.",
-                    "readonly": true
+                    "readonly": false
                 },
                 "PhysicalSubContext": {
                     "anyOf": [
@@ -681,7 +709,7 @@
                     "description": "The usage or location within a device to which this sensor measurement applies.",
                     "excerpt": "SensorArray,SensorFanArray,SensorPowerArray",
                     "longDescription": "This property shall contain a description of the usage or sub-region within the equipment to which this sensor measurement applies.  This property generally differentiates multiple sensors within the same `PhysicalContext` instance.",
-                    "readonly": true
+                    "readonly": false
                 },
                 "PowerFactor": {
                     "description": "The power factor for this sensor.",
@@ -818,7 +846,7 @@
                         "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/idRef"
                     },
                     "longDescription": "This property shall contain an array of links to resources or objects that this sensor services.",
-                    "readonly": true,
+                    "readonly": false,
                     "type": "array",
                     "versionAdded": "v1_2_0"
                 },
@@ -1013,7 +1041,7 @@
                     "description": "The area or device to which this sensor measurement applies.",
                     "excerpt": "SensorArray,SensorFanArray,SensorPowerArray",
                     "longDescription": "This property shall contain a description of the affected component or region within the equipment to which this sensor measurement applies.",
-                    "readonly": true
+                    "readonly": false
                 },
                 "PhysicalSubContext": {
                     "anyOf": [
@@ -1027,7 +1055,7 @@
                     "description": "The usage or location within a device to which this sensor measurement applies.",
                     "excerpt": "SensorArray,SensorFanArray,SensorPowerArray",
                     "longDescription": "This property shall contain a description of the usage or sub-region within the equipment to which this sensor measurement applies.  This property generally differentiates multiple sensors within the same `PhysicalContext` instance.",
-                    "readonly": true
+                    "readonly": false
                 },
                 "Reading": {
                     "description": "The sensor value.",
@@ -1299,7 +1327,7 @@
                     "description": "The area or device to which this sensor measurement applies.",
                     "excerpt": "SensorArray,SensorFanArray,SensorPowerArray",
                     "longDescription": "This property shall contain a description of the affected component or region within the equipment to which this sensor measurement applies.",
-                    "readonly": true
+                    "readonly": false
                 },
                 "PhysicalSubContext": {
                     "anyOf": [
@@ -1313,7 +1341,7 @@
                     "description": "The usage or location within a device to which this sensor measurement applies.",
                     "excerpt": "SensorArray,SensorFanArray,SensorPowerArray",
                     "longDescription": "This property shall contain a description of the usage or sub-region within the equipment to which this sensor measurement applies.  This property generally differentiates multiple sensors within the same `PhysicalContext` instance.",
-                    "readonly": true
+                    "readonly": false
                 },
                 "Reading": {
                     "description": "The sensor value.",
@@ -1463,7 +1491,7 @@
                     "description": "The area or device to which this sensor measurement applies.",
                     "excerpt": "SensorArray,SensorFanArray,SensorPowerArray",
                     "longDescription": "This property shall contain a description of the affected component or region within the equipment to which this sensor measurement applies.",
-                    "readonly": true
+                    "readonly": false
                 },
                 "PhysicalSubContext": {
                     "anyOf": [
@@ -1477,7 +1505,7 @@
                     "description": "The usage or location within a device to which this sensor measurement applies.",
                     "excerpt": "SensorArray,SensorFanArray,SensorPowerArray",
                     "longDescription": "This property shall contain a description of the usage or sub-region within the equipment to which this sensor measurement applies.  This property generally differentiates multiple sensors within the same `PhysicalContext` instance.",
-                    "readonly": true
+                    "readonly": false
                 },
                 "PowerFactor": {
                     "description": "The power factor for this sensor.",
@@ -1908,6 +1936,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2024.2",
-    "title": "#Sensor.v1_10_1.Sensor"
+    "release": "2025.2",
+    "title": "#Sensor.v1_11_0.Sensor"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/SerialInterface.v1_2_1.json b/redfish-core/schema/dmtf/json-schema/SerialInterface.v1_3_0.json
similarity index 75%
rename from redfish-core/schema/dmtf/json-schema/SerialInterface.v1_2_1.json
rename to redfish-core/schema/dmtf/json-schema/SerialInterface.v1_3_0.json
index 8da5450..cba81f9 100644
--- a/redfish-core/schema/dmtf/json-schema/SerialInterface.v1_2_1.json
+++ b/redfish-core/schema/dmtf/json-schema/SerialInterface.v1_3_0.json
@@ -1,8 +1,8 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/SerialInterface.v1_2_1.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/SerialInterface.v1_3_0.json",
     "$ref": "#/definitions/SerialInterface",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
-    "copyright": "Copyright 2014-2024 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
+    "copyright": "Copyright 2014-2025 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
     "definitions": {
         "Actions": {
             "additionalProperties": false,
@@ -137,6 +137,57 @@
             },
             "type": "object"
         },
+        "Modbus": {
+            "additionalProperties": false,
+            "description": "The Modbus settings for the serial interface.",
+            "longDescription": "This type shall contain the Modbus settings for this serial interface.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "ReadOnly": {
+                    "description": "Indicates if the interface is read only.",
+                    "longDescription": "This property shall indicate if the serial interface is read only.  If `true`, the serial service on this manager shall reject or ignore requests that modify data.  This property shall only be present if the `Role` property contains `Server`.",
+                    "readonly": false,
+                    "type": [
+                        "boolean",
+                        "null"
+                    ],
+                    "versionAdded": "v1_3_0"
+                },
+                "Role": {
+                    "$ref": "#/definitions/Role",
+                    "description": "The role of the serial interface.",
+                    "longDescription": "This property shall contain the role of this serial interface.",
+                    "readonly": false,
+                    "versionAdded": "v1_3_0"
+                },
+                "ServerId": {
+                    "description": "The server identifier for this Modbus RTU interface.",
+                    "longDescription": "This property shall contain the MODBUS over Serial Line Specification and Implementation guide-defined address that identifies this Modbus RTU server.  This property shall only be present if the `Role` property contains `Server`.",
+                    "maximum": 247,
+                    "minimum": 1,
+                    "readonly": false,
+                    "type": [
+                        "integer",
+                        "null"
+                    ],
+                    "versionAdded": "v1_3_0"
+                }
+            },
+            "type": "object"
+        },
         "OemActions": {
             "additionalProperties": true,
             "description": "The available OEM-specific actions for this resource.",
@@ -179,12 +230,39 @@
             "enum": [
                 "Cisco",
                 "Cyclades",
-                "Digi"
+                "Digi",
+                "Modbus2Wire",
+                "Modbus4Wire",
+                "ModbusRs232"
             ],
             "enumDescriptions": {
                 "Cisco": "The Cisco pinout configuration.",
                 "Cyclades": "The Cyclades pinout configuration.",
-                "Digi": "The Digi pinout configuration."
+                "Digi": "The Digi pinout configuration.",
+                "Modbus2Wire": "The Modbus 2 wire pinout configuration.",
+                "Modbus4Wire": "The Modbus 4 wire pinout configuration.",
+                "ModbusRs232": "The Modbus RS232 pinout configuration."
+            },
+            "enumLongDescriptions": {
+                "Modbus2Wire": "This value shall indicate the MODBUS over Serial Line Specification and Implementation guide-defined 2W-MODBUS pinout.  This value shall only be used if the `SignalType` property contains `Rs485`.",
+                "Modbus4Wire": "This value shall indicate the MODBUS over Serial Line Specification and Implementation guide-defined 4W-MODBUS pinout.  This value shall only be used if the `SignalType` property contains `Rs485`.",
+                "ModbusRs232": "This value shall indicate the MODBUS over Serial Line Specification and Implementation guide-defined RS232-MODBUS pinout.  This value shall only be used if the `SignalType` property contains `Rs232`."
+            },
+            "enumVersionAdded": {
+                "Modbus2Wire": "v1_3_0",
+                "Modbus4Wire": "v1_3_0",
+                "ModbusRs232": "v1_3_0"
+            },
+            "type": "string"
+        },
+        "Role": {
+            "enum": [
+                "Client",
+                "Server"
+            ],
+            "enumDescriptions": {
+                "Client": "The serial interface is a client and connects to one or more servers across a serial bus.",
+                "Server": "The serial interface is a server and allows one or more clients to connect across a serial bus."
             },
             "type": "string"
         },
@@ -279,6 +357,12 @@
                     "longDescription": "This property shall contain links to resources that are related to but are not contained by, or subordinate to, this resource.",
                     "versionAdded": "v1_2_0"
                 },
+                "Modbus": {
+                    "$ref": "#/definitions/Modbus",
+                    "description": "The Modbus settings for the serial interface.",
+                    "longDescription": "This property shall contain the Modbus settings for this serial interface.",
+                    "versionAdded": "v1_3_0"
+                },
                 "Name": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Name",
                     "readonly": true
@@ -353,6 +437,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2023.2",
-    "title": "#SerialInterface.v1_2_1.SerialInterface"
+    "release": "2025.2",
+    "title": "#SerialInterface.v1_3_0.SerialInterface"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/ServiceRoot.v1_18_0.json b/redfish-core/schema/dmtf/json-schema/ServiceRoot.v1_19_0.json
similarity index 97%
rename from redfish-core/schema/dmtf/json-schema/ServiceRoot.v1_18_0.json
rename to redfish-core/schema/dmtf/json-schema/ServiceRoot.v1_19_0.json
index 9df4d32..ad15906 100644
--- a/redfish-core/schema/dmtf/json-schema/ServiceRoot.v1_18_0.json
+++ b/redfish-core/schema/dmtf/json-schema/ServiceRoot.v1_19_0.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/ServiceRoot.v1_18_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/ServiceRoot.v1_19_0.json",
     "$ref": "#/definitions/ServiceRoot",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2025 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -290,6 +290,13 @@
                     "readonly": true,
                     "versionAdded": "v1_8_0"
                 },
+                "AutomationNodes": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/AutomationNodeCollection.json#/definitions/AutomationNodeCollection",
+                    "description": "The link to a collection of automation nodes.",
+                    "longDescription": "This property shall contain a link to a resource collection of type `AutomationNodeCollection`.",
+                    "readonly": true,
+                    "versionAdded": "v1_19_0"
+                },
                 "Cables": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/CableCollection.json#/definitions/CableCollection",
                     "description": "The link to a collection of cables.",
@@ -571,6 +578,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2025.1",
-    "title": "#ServiceRoot.v1_18_0.ServiceRoot"
+    "release": "2025.2",
+    "title": "#ServiceRoot.v1_19_0.ServiceRoot"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/SoftwareInventory.v1_11_0.json b/redfish-core/schema/dmtf/json-schema/SoftwareInventory.v1_12_0.json
similarity index 77%
rename from redfish-core/schema/dmtf/json-schema/SoftwareInventory.v1_11_0.json
rename to redfish-core/schema/dmtf/json-schema/SoftwareInventory.v1_12_0.json
index 71056e0..e23aa43 100644
--- a/redfish-core/schema/dmtf/json-schema/SoftwareInventory.v1_11_0.json
+++ b/redfish-core/schema/dmtf/json-schema/SoftwareInventory.v1_12_0.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/SoftwareInventory.v1_11_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/SoftwareInventory.v1_12_0.json",
     "$ref": "#/definitions/SoftwareInventory",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2025 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -23,6 +23,9 @@
                 }
             },
             "properties": {
+                "#SoftwareInventory.Activate": {
+                    "$ref": "#/definitions/Activate"
+                },
                 "Oem": {
                     "$ref": "#/definitions/OemActions",
                     "description": "The available OEM-specific actions for this resource.",
@@ -31,6 +34,48 @@
             },
             "type": "object"
         },
+        "Activate": {
+            "additionalProperties": false,
+            "description": "This action activates this software inventory instance.",
+            "longDescription": "This action shall activate this software inventory instance.",
+            "parameters": {
+                "Targets": {
+                    "description": "The target devices to activate this software image.  If not specified, the service activates this software image on all applicable devices.",
+                    "items": {
+                        "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/idRef"
+                    },
+                    "longDescription": "This parameter shall contain an array of target devices to activate this software image.  If not specified, the service shall activate this software image on all applicable devices.",
+                    "type": "array"
+                }
+            },
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "target": {
+                    "description": "Link to invoke action",
+                    "format": "uri-reference",
+                    "type": "string"
+                },
+                "title": {
+                    "description": "Friendly action name",
+                    "type": "string"
+                }
+            },
+            "type": "object",
+            "versionAdded": "v1_12_0"
+        },
         "AdditionalVersions": {
             "additionalProperties": false,
             "description": "Additional versions.",
@@ -119,6 +164,54 @@
             },
             "type": "object"
         },
+        "Links": {
+            "additionalProperties": false,
+            "description": "The links to other resources that are related to this resource.",
+            "longDescription": "This property shall contain links to resources that are related to but are not contained by, or subordinate to, this resource.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "ActiveTargets": {
+                    "description": "An array of devices where this software image is currently running.",
+                    "items": {
+                        "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/idRef"
+                    },
+                    "longDescription": "This property shall contain an array of links to resources or objects that represent the devices where this software image is currently running.",
+                    "readonly": true,
+                    "type": "array",
+                    "versionAdded": "v1_12_0"
+                },
+                "ActiveTargets@odata.count": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
+                },
+                "StagedTargets": {
+                    "description": "An array of devices where this software image is staged and ready to be activated.",
+                    "items": {
+                        "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/idRef"
+                    },
+                    "longDescription": "This property shall contain an array of links to resources or objects that represent the devices where this software image is staged and ready to be activated.",
+                    "readonly": true,
+                    "type": "array",
+                    "versionAdded": "v1_12_0"
+                },
+                "StagedTargets@odata.count": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
+                }
+            },
+            "type": "object"
+        },
         "MeasurementBlock": {
             "additionalProperties": false,
             "description": "The DSP0274-defined measurement block information.",
@@ -257,6 +350,16 @@
                     "description": "The available actions for this resource.",
                     "longDescription": "This property shall contain the available actions for this resource."
                 },
+                "Active": {
+                    "description": "This image is active on one or more devices.",
+                    "longDescription": "This property shall indicate that the software image is currently in use on one or more devices.",
+                    "readonly": true,
+                    "type": [
+                        "boolean",
+                        "null"
+                    ],
+                    "versionAdded": "v1_12_0"
+                },
                 "AdditionalVersions": {
                     "$ref": "#/definitions/AdditionalVersions",
                     "description": "The additional versions of this software.",
@@ -285,6 +388,12 @@
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Id",
                     "readonly": true
                 },
+                "Links": {
+                    "$ref": "#/definitions/Links",
+                    "description": "The links to other resources that are related to this resource.",
+                    "longDescription": "This property shall contain links to resources that are related to but are not contained by, or subordinate to, this resource.",
+                    "versionAdded": "v1_12_0"
+                },
                 "LowestSupportedVersion": {
                     "description": "The lowest supported version of this software.",
                     "longDescription": "This property shall represent the lowest supported version of this software.  This string is formatted using the same format used for the `Version` property.",
@@ -360,6 +469,16 @@
                     "readonly": true,
                     "versionAdded": "v1_10_0"
                 },
+                "ResetRequiredOnUpdate": {
+                    "description": "An indication of whether a reset is required to apply an update to this software.",
+                    "longDescription": "This property shall indicate whether a reset is required to apply an update to this software.  If `true`, a reset is required and clients should expect a disruption in communication to targets utilizing this software while applying an update.  If `false`, a reset is not required and communication can be maintained to targets utilizing this software throughout an update.",
+                    "readonly": true,
+                    "type": [
+                        "boolean",
+                        "null"
+                    ],
+                    "versionAdded": "v1_12_0"
+                },
                 "SoftwareId": {
                     "description": "The implementation-specific label that identifies this software.",
                     "longDescription": "This property shall represent an implementation-specific label that identifies this software.  This string correlates with a component repository or database.",
@@ -367,6 +486,16 @@
                     "type": "string",
                     "versionAdded": "v1_1_0"
                 },
+                "Staged": {
+                    "description": "This image is ready to be activated to one or more devices.",
+                    "longDescription": "This property shall indicate that the software image is ready to be activated to one or more devices.",
+                    "readonly": true,
+                    "type": [
+                        "boolean",
+                        "null"
+                    ],
+                    "versionAdded": "v1_12_0"
+                },
                 "Status": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Status",
                     "description": "The status and health of the resource and its subordinate or dependent resources.",
@@ -457,6 +586,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2025.1",
-    "title": "#SoftwareInventory.v1_11_0.SoftwareInventory"
+    "release": "2025.2",
+    "title": "#SoftwareInventory.v1_12_0.SoftwareInventory"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/Storage.v1_18_0.json b/redfish-core/schema/dmtf/json-schema/Storage.v1_19_0.json
similarity index 95%
rename from redfish-core/schema/dmtf/json-schema/Storage.v1_18_0.json
rename to redfish-core/schema/dmtf/json-schema/Storage.v1_19_0.json
index 959e6f4..4ce70d7 100644
--- a/redfish-core/schema/dmtf/json-schema/Storage.v1_18_0.json
+++ b/redfish-core/schema/dmtf/json-schema/Storage.v1_19_0.json
@@ -1,8 +1,8 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Storage.v1_18_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Storage.v1_19_0.json",
     "$ref": "#/definitions/Storage",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
-    "copyright": "Copyright 2014-2024 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
+    "copyright": "Copyright 2014-2025 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
     "definitions": {
         "Actions": {
             "additionalProperties": false,
@@ -23,6 +23,9 @@
                 }
             },
             "properties": {
+                "#Storage.ImportForeignDrives": {
+                    "$ref": "#/definitions/ImportForeignDrives"
+                },
                 "#Storage.RekeyExternalKey": {
                     "$ref": "#/definitions/RekeyExternalKey"
                 },
@@ -183,6 +186,56 @@
             },
             "type": "string"
         },
+        "ImportForeignDrives": {
+            "additionalProperties": false,
+            "description": "This action imports encrypted foreign drives to a host-based storage controller by supplying encryption access credentials.",
+            "longDescription": "This action shall import encrypted foreign drives to a host-based storage controller by supplying encryption access credentials.  Upon successful completion, the `EncryptionStatus` property of the affected `Drive` shall change from `Foreign` to `Unlocked`.",
+            "parameters": {
+                "ControllerPassword": {
+                    "description": "The current controller password.  This parameter is not required if the controller does not currently have a password.",
+                    "longDescription": "This parameter shall contain the current controller password.  Services may reject the action request if this parameter is not provided or the value supplied does not match the current password.",
+                    "type": "string"
+                },
+                "DriveEncryptionKey": {
+                    "description": "The encryption key to unlock the drives.",
+                    "longDescription": "This parameter shall contain the encryption key to unlock the drives.",
+                    "requiredParameter": true,
+                    "type": "string"
+                },
+                "DriveEncryptionKeyIdentifier": {
+                    "description": "An encryption key identifier to filter the drives that are imported.  If not provided, the controller attempts to import all foreign drives.",
+                    "longDescription": "This parameter shall contain an encryption key identifier to filter the drives that are imported.  If this parameter is not provided, the service shall not perform filtering of foreign drives.",
+                    "type": "string"
+                }
+            },
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "target": {
+                    "description": "Link to invoke action",
+                    "format": "uri-reference",
+                    "type": "string"
+                },
+                "title": {
+                    "description": "Friendly action name",
+                    "type": "string"
+                }
+            },
+            "type": "object",
+            "versionAdded": "v1_19_0"
+        },
         "Links": {
             "additionalProperties": false,
             "description": "The links to other resources that are related to this resource.",
@@ -1372,6 +1425,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2024.4",
-    "title": "#Storage.v1_18_0.Storage"
+    "release": "2025.2",
+    "title": "#Storage.v1_19_0.Storage"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/Switch.v1_9_3.json b/redfish-core/schema/dmtf/json-schema/Switch.v1_10_0.json
similarity index 92%
rename from redfish-core/schema/dmtf/json-schema/Switch.v1_9_3.json
rename to redfish-core/schema/dmtf/json-schema/Switch.v1_10_0.json
index aa01857..ded9fff 100644
--- a/redfish-core/schema/dmtf/json-schema/Switch.v1_9_3.json
+++ b/redfish-core/schema/dmtf/json-schema/Switch.v1_10_0.json
@@ -1,8 +1,8 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Switch.v1_9_3.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Switch.v1_10_0.json",
     "$ref": "#/definitions/Switch",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
-    "copyright": "Copyright 2014-2024 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
+    "copyright": "Copyright 2014-2025 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
     "definitions": {
         "Actions": {
             "additionalProperties": false,
@@ -60,6 +60,27 @@
                     "type": "integer",
                     "versionAdded": "v1_9_0"
                 },
+                "NumberOfBoundvPPBs": {
+                    "description": "The total number of vPPBs (Virtual PCI-to-PCI Bridges) that are currently bound on this switch.",
+                    "longDescription": "This property shall contain the total number of vPPBs (Virtual PCI-to-PCI Bridges) that are currently bound on this switch.",
+                    "readonly": true,
+                    "type": "integer",
+                    "versionAdded": "v1_10_0"
+                },
+                "PBRCapable": {
+                    "description": "An indication of whether the switch is capable of performing port-based routing.",
+                    "longDescription": "This property shall indicate whether the switch is capable of performing port-based routing.",
+                    "readonly": true,
+                    "type": "boolean",
+                    "versionAdded": "v1_10_0"
+                },
+                "TotalHDMDecoders": {
+                    "description": "The total number of HDM (Host Device Memory) decoders available per upstream port.",
+                    "longDescription": "This property shall contain the total number of HDM (Host Device Memory) decoders available per upstream port.",
+                    "readonly": true,
+                    "type": "integer",
+                    "versionAdded": "v1_10_0"
+                },
                 "TotalNumbervPPBs": {
                     "description": "The total number of virtual PCI-to-PCI bridges (vPPBs) supported in this switch.",
                     "longDescription": "This property shall contain the total number of virtual PCI-to-PCI bridges (vPPBs) supported in this switch.",
@@ -69,9 +90,18 @@
                 },
                 "VCS": {
                     "$ref": "#/definitions/VCSSwitch",
+                    "deprecated": "This property has been deprecated in favor of `VirtualCXLSwitches` in `CXL`.",
                     "description": "Virtual CXL Switch (VCS) properties for this switch.",
                     "longDescription": "This property shall contain Virtual CXL Switch (VCS) properties for this switch.",
-                    "versionAdded": "v1_9_0"
+                    "versionAdded": "v1_9_0",
+                    "versionDeprecated": "v1_9_0"
+                },
+                "VirtualCXLSwitches": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/VirtualCXLSwitchCollection.json#/definitions/VirtualCXLSwitchCollection",
+                    "description": "The link to the collection of Virtual CXL Switches (VCS) for this CXL switch.",
+                    "longDescription": "This property shall contain a link to a resource collection of type `VirtualCXLSwitchCollection`.",
+                    "readonly": true,
+                    "versionAdded": "v1_10_0"
                 }
             },
             "type": "object"
@@ -575,6 +605,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2022.3",
-    "title": "#Switch.v1_9_3.Switch"
+    "release": "2025.2",
+    "title": "#Switch.v1_10_0.Switch"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/TelemetryData.v1_0_0.json b/redfish-core/schema/dmtf/json-schema/TelemetryData.v1_0_0.json
new file mode 100644
index 0000000..a85a964
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema/TelemetryData.v1_0_0.json
@@ -0,0 +1,183 @@
+{
+    "$id": "http://redfish.dmtf.org/schemas/v1/TelemetryData.v1_0_0.json",
+    "$ref": "#/definitions/TelemetryData",
+    "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
+    "copyright": "Copyright 2014-2025 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
+    "definitions": {
+        "Actions": {
+            "additionalProperties": false,
+            "description": "The available actions for this resource.",
+            "longDescription": "This type shall contain the available actions for this resource.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "Oem": {
+                    "$ref": "#/definitions/OemActions",
+                    "description": "The available OEM-specific actions for this resource.",
+                    "longDescription": "This property shall contain the available OEM-specific actions for this resource."
+                }
+            },
+            "type": "object"
+        },
+        "OemActions": {
+            "additionalProperties": true,
+            "description": "The available OEM-specific actions for this resource.",
+            "longDescription": "This type shall contain the available OEM-specific actions for this resource.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {},
+            "type": "object"
+        },
+        "TelemetryData": {
+            "additionalProperties": false,
+            "description": "The `TelemetryData` schema represents bulk telemetry data from a device or service.",
+            "longDescription": "This resource shall represent bulk telemetry data in a Redfish implementation.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "@odata.context": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/context"
+                },
+                "@odata.etag": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/etag"
+                },
+                "@odata.id": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/id"
+                },
+                "@odata.type": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/type"
+                },
+                "Actions": {
+                    "$ref": "#/definitions/Actions",
+                    "description": "The available actions for this resource.",
+                    "longDescription": "This property shall contain the available actions for this resource."
+                },
+                "AdditionalData": {
+                    "description": "A Base64-encoded string of the associated telemetry data.",
+                    "longDescription": "This property shall contain a Base64-encoded string, with padding characters, of the associated telemetry data.  The contents shall depend on the value of the `TelemetryDataType` property.  The length of the value should not exceed 4 KB.  Larger telemetry data payloads should omit this property and use the `AdditionalDataURI` property to reference the data.  If both `AdditionalData` and `AdditionalDataURI` are present, `AdditionalData` shall contain the Base64-encoding of the data retrieved from the URI specified by the `AdditionalDataURI` property.",
+                    "readonly": true,
+                    "type": "string"
+                },
+                "AdditionalDataSizeBytes": {
+                    "description": "The size of the data available at location specified by `AdditionalDataURI`.",
+                    "longDescription": "This property shall contain the size of the data available at location specified by `AdditionalDataURI`:.",
+                    "readonly": true,
+                    "type": [
+                        "integer",
+                        "null"
+                    ]
+                },
+                "AdditionalDataURI": {
+                    "description": "The URI at which to access the associated telemetry data.",
+                    "format": "uri-reference",
+                    "longDescription": "This property shall contain the URI at which to access the associated telemetry data, using the Redfish protocol and authentication methods.  If both `AdditionalData` and `AdditionalDataURI` are present, `AdditionalData` shall contain a Base64-encoded string, with padding characters, of the data retrieved from the URI specified by the `AdditionalDataURI` property.",
+                    "readonly": true,
+                    "type": "string"
+                },
+                "Description": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Description"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "readonly": true
+                },
+                "Id": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Id",
+                    "readonly": true
+                },
+                "Name": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Name",
+                    "readonly": true
+                },
+                "OEMTelemetryDataType": {
+                    "description": "The OEM-defined type of telemetry data available in the `AdditionalData` property or retrieved from the URI specified by the `AdditionalDataURI` property.",
+                    "longDescription": "This property shall contain the OEM-defined type of telemetry data available in the `AdditionalData` property or retrieved from the URI specified by the `AdditionalDataURI` property.  The value of this property should begin with the organization identifier.  This property shall be present if `TelemetryDataType` is `OEM`.",
+                    "readonly": true,
+                    "type": [
+                        "string",
+                        "null"
+                    ]
+                },
+                "Oem": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Oem",
+                    "description": "The OEM extension property.",
+                    "longDescription": "This property shall contain the OEM extensions.  All values for properties that this object contains shall conform to the Redfish Specification-described requirements."
+                },
+                "TelemetryDataType": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/TelemetryData.json#/definitions/TelemetryDataTypes"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The type of telemetry data available in the `AdditionalData` property or retrieved from the URI specified by the `AdditionalDataURI` property.",
+                    "longDescription": "This property shall contain the type of telemetry data available in the `AdditionalData` property or retrieved from the URI specified by the `AdditionalDataURI` property.",
+                    "readonly": true
+                },
+                "Timestamp": {
+                    "description": "The date and time when the telemetry data was generated.",
+                    "format": "date-time",
+                    "longDescription": "This property shall contain the time when the telemetry data was generated.",
+                    "readonly": true,
+                    "type": [
+                        "string",
+                        "null"
+                    ]
+                }
+            },
+            "required": [
+                "@odata.id",
+                "@odata.type",
+                "Id",
+                "Name"
+            ],
+            "type": "object"
+        }
+    },
+    "language": "en",
+    "owningEntity": "DMTF",
+    "release": "2025.2",
+    "title": "#TelemetryData.v1_0_0.TelemetryData"
+}
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/TelemetryDataCollection.json b/redfish-core/schema/dmtf/json-schema/TelemetryDataCollection.json
new file mode 100644
index 0000000..2a0d4fa
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema/TelemetryDataCollection.json
@@ -0,0 +1,100 @@
+{
+    "$id": "http://redfish.dmtf.org/schemas/v1/TelemetryDataCollection.json",
+    "$ref": "#/definitions/TelemetryDataCollection",
+    "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
+    "copyright": "Copyright 2014-2025 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
+    "definitions": {
+        "TelemetryDataCollection": {
+            "anyOf": [
+                {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/idRef"
+                },
+                {
+                    "additionalProperties": false,
+                    "description": "The collection of `TelemetryData` resource instances.",
+                    "longDescription": "This resource shall represent a resource collection of `TelemetryData` instances for a Redfish implementation.",
+                    "patternProperties": {
+                        "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                            "description": "This property shall specify a valid odata or Redfish property.",
+                            "type": [
+                                "array",
+                                "boolean",
+                                "integer",
+                                "number",
+                                "null",
+                                "object",
+                                "string"
+                            ]
+                        }
+                    },
+                    "properties": {
+                        "@odata.context": {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/context"
+                        },
+                        "@odata.etag": {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/etag"
+                        },
+                        "@odata.id": {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/id"
+                        },
+                        "@odata.type": {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/type"
+                        },
+                        "Description": {
+                            "anyOf": [
+                                {
+                                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Description"
+                                },
+                                {
+                                    "type": "null"
+                                }
+                            ],
+                            "readonly": true
+                        },
+                        "Members": {
+                            "description": "The members of this collection.",
+                            "items": {
+                                "$ref": "http://redfish.dmtf.org/schemas/v1/TelemetryData.json#/definitions/TelemetryData"
+                            },
+                            "longDescription": "This property shall contain an array of links to the members of this collection.",
+                            "readonly": true,
+                            "type": "array"
+                        },
+                        "Members@odata.count": {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
+                        },
+                        "Members@odata.nextLink": {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/nextLink"
+                        },
+                        "Name": {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Name",
+                            "readonly": true
+                        },
+                        "Oem": {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Oem",
+                            "description": "The OEM extension property.",
+                            "longDescription": "This property shall contain the OEM extensions.  All values for properties contained in this object shall conform to the Redfish Specification-described requirements."
+                        }
+                    },
+                    "required": [
+                        "Members",
+                        "Members@odata.count",
+                        "@odata.id",
+                        "@odata.type",
+                        "Name"
+                    ],
+                    "type": "object"
+                }
+            ],
+            "deletable": false,
+            "insertable": false,
+            "updatable": false,
+            "uris": [
+                "/redfish/v1/TelemetryService/TelemetryData"
+            ]
+        }
+    },
+    "language": "en",
+    "owningEntity": "DMTF",
+    "title": "#TelemetryDataCollection.TelemetryDataCollection"
+}
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/TelemetryService.v1_3_4.json b/redfish-core/schema/dmtf/json-schema/TelemetryService.v1_4_0.json
similarity index 73%
rename from redfish-core/schema/dmtf/json-schema/TelemetryService.v1_3_4.json
rename to redfish-core/schema/dmtf/json-schema/TelemetryService.v1_4_0.json
index 16a2579..33dd81d 100644
--- a/redfish-core/schema/dmtf/json-schema/TelemetryService.v1_3_4.json
+++ b/redfish-core/schema/dmtf/json-schema/TelemetryService.v1_4_0.json
@@ -1,8 +1,8 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/TelemetryService.v1_3_4.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/TelemetryService.v1_4_0.json",
     "$ref": "#/definitions/TelemetryService",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
-    "copyright": "Copyright 2014-2024 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
+    "copyright": "Copyright 2014-2025 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
     "definitions": {
         "Actions": {
             "additionalProperties": false,
@@ -26,6 +26,12 @@
                 "#TelemetryService.ClearMetricReports": {
                     "$ref": "#/definitions/ClearMetricReports"
                 },
+                "#TelemetryService.ClearTelemetryData": {
+                    "$ref": "#/definitions/ClearTelemetryData"
+                },
+                "#TelemetryService.CollectTelemetryData": {
+                    "$ref": "#/definitions/CollectTelemetryData"
+                },
                 "#TelemetryService.ResetMetricReportDefinitionsToDefaults": {
                     "$ref": "#/definitions/ResetMetricReportDefinitionsToDefaults"
                 },
@@ -76,6 +82,130 @@
             "type": "object",
             "versionAdded": "v1_3_0"
         },
+        "ClearTelemetryData": {
+            "additionalProperties": false,
+            "description": "The action to clear the telemetry data for this telemetry service.",
+            "longDescription": "This action shall delete all entries found in the telemetry data collection for this telemetry service.",
+            "parameters": {},
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "target": {
+                    "description": "Link to invoke action",
+                    "format": "uri-reference",
+                    "type": "string"
+                },
+                "title": {
+                    "description": "Friendly action name",
+                    "type": "string"
+                }
+            },
+            "type": "object",
+            "versionAdded": "v1_4_0"
+        },
+        "CollectTelemetryData": {
+            "actionResponse": {
+                "$ref": "#/definitions/CollectTelemetryDataResponse"
+            },
+            "additionalProperties": false,
+            "description": "The action to collect the telemetry data from a device or service.  When the telemetry data is collected, a new telemetry data resource will be created.",
+            "longDescription": "This action shall collect the telemetry data from a device or service.  The `Location` header in the response shall contain a URI to a resource of type `TelemetryData` that contains the telemetry data.  The `AdditionalDataURI` property in the referenced `TelemetryData` resource shall contain the URI to download the telemetry data.",
+            "parameters": {
+                "OEMTelemetryDataType": {
+                    "description": "The OEM-defined type of telemetry data to collect.",
+                    "longDescription": "This parameter shall contain the OEM-defined type of telemetry data to collect.  This parameter shall be required if `TelemetryDataType` is `OEM`.",
+                    "type": "string"
+                },
+                "TargetDevices": {
+                    "description": "An array of devices from which to collect telemetry data.",
+                    "items": {
+                        "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/idRef"
+                    },
+                    "longDescription": "This parameter shall contain an array of devices from which to collect telemetry data.",
+                    "type": "array"
+                },
+                "TelemetryDataType": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/TelemetryData.json#/definitions/TelemetryDataTypes",
+                    "description": "The type of telemetry data to collect.",
+                    "longDescription": "This parameter shall contain the type of telemetry data to collect.",
+                    "requiredParameter": true
+                }
+            },
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "target": {
+                    "description": "Link to invoke action",
+                    "format": "uri-reference",
+                    "type": "string"
+                },
+                "title": {
+                    "description": "Friendly action name",
+                    "type": "string"
+                }
+            },
+            "type": "object",
+            "versionAdded": "v1_4_0"
+        },
+        "CollectTelemetryDataResponse": {
+            "additionalProperties": false,
+            "description": "The response body for the `CollectTelemetryData` action.",
+            "longDescription": "This type shall contain the properties found in the response body for the `CollectTelemetryData` action.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "TelmetryData": {
+                    "description": "An array of links to the collected telemetry data.",
+                    "items": {
+                        "type": "string"
+                    },
+                    "longDescription": "This property shall contain an array of links to resources of type `TelemetryData` that represent the collected telemetry data.",
+                    "readonly": true,
+                    "type": "array",
+                    "versionAdded": "v1_4_0"
+                }
+            },
+            "required": [
+                "TelmetryData"
+            ],
+            "type": "object"
+        },
         "CollectionFunction": {
             "description": "An operation to perform over the sample.",
             "enum": [
@@ -441,6 +571,43 @@
                     "readonly": true,
                     "type": "array"
                 },
+                "SupportedOEMTelemetryDataTypes": {
+                    "description": "A list of supported OEM-defined telemetry data types.",
+                    "items": {
+                        "type": [
+                            "string",
+                            "null"
+                        ]
+                    },
+                    "longDescription": "This property shall contain a list of supported OEM-defined telemetry data types.",
+                    "readonly": true,
+                    "type": "array",
+                    "versionAdded": "v1_4_0"
+                },
+                "SupportedTelemetryDataTypes": {
+                    "description": "A list of supported telemetry data types.",
+                    "items": {
+                        "anyOf": [
+                            {
+                                "$ref": "http://redfish.dmtf.org/schemas/v1/TelemetryData.json#/definitions/TelemetryDataTypes"
+                            },
+                            {
+                                "type": "null"
+                            }
+                        ]
+                    },
+                    "longDescription": "This property shall contain a list of supported telemetry data types.",
+                    "readonly": true,
+                    "type": "array",
+                    "versionAdded": "v1_4_0"
+                },
+                "TelemetryData": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/TelemetryDataCollection.json#/definitions/TelemetryDataCollection",
+                    "description": "The link to the collection of data telemetry.",
+                    "longDescription": "This property shall contain a link to a resource collection of type `TelemetryDataCollection`.",
+                    "readonly": true,
+                    "versionAdded": "v1_4_0"
+                },
                 "Triggers": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/TriggersCollection.json#/definitions/TriggersCollection",
                     "description": "The link to the collection of triggers that apply to metrics.",
@@ -459,6 +626,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2020.4",
-    "title": "#TelemetryService.v1_3_4.TelemetryService"
+    "release": "2025.2",
+    "title": "#TelemetryService.v1_4_0.TelemetryService"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/ThermalEquipment.v1_1_2.json b/redfish-core/schema/dmtf/json-schema/ThermalEquipment.v1_2_0.json
similarity index 92%
rename from redfish-core/schema/dmtf/json-schema/ThermalEquipment.v1_1_2.json
rename to redfish-core/schema/dmtf/json-schema/ThermalEquipment.v1_2_0.json
index b9f44f3..82942e5 100644
--- a/redfish-core/schema/dmtf/json-schema/ThermalEquipment.v1_1_2.json
+++ b/redfish-core/schema/dmtf/json-schema/ThermalEquipment.v1_2_0.json
@@ -1,8 +1,8 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/ThermalEquipment.v1_1_2.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/ThermalEquipment.v1_2_0.json",
     "$ref": "#/definitions/ThermalEquipment",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
-    "copyright": "Copyright 2014-2024 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
+    "copyright": "Copyright 2014-2025 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
     "definitions": {
         "Actions": {
             "additionalProperties": false,
@@ -145,6 +145,13 @@
                     "description": "The OEM extension property.",
                     "longDescription": "This property shall contain the OEM extensions.  All values for properties that this object contains shall conform to the Redfish Specification-described requirements."
                 },
+                "RPUs": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/CoolingUnitCollection.json#/definitions/CoolingUnitCollection",
+                    "description": "A link to a collection of reservoir and pumping units (RPUs).",
+                    "longDescription": "This property shall contain a link to a resource collection of type `CoolingUnitCollection` that contains a set of reservoir and pumping units.",
+                    "readonly": true,
+                    "versionAdded": "v1_2_0"
+                },
                 "Status": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Status",
                     "description": "The status and health of the resource and its subordinate or dependent resources.",
@@ -162,6 +169,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2023.2",
-    "title": "#ThermalEquipment.v1_1_2.ThermalEquipment"
+    "release": "2025.2",
+    "title": "#ThermalEquipment.v1_2_0.ThermalEquipment"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/ThermalSubsystem.v1_3_3.json b/redfish-core/schema/dmtf/json-schema/ThermalSubsystem.v1_4_0.json
similarity index 91%
rename from redfish-core/schema/dmtf/json-schema/ThermalSubsystem.v1_3_3.json
rename to redfish-core/schema/dmtf/json-schema/ThermalSubsystem.v1_4_0.json
index 9458771..ee13e3c 100644
--- a/redfish-core/schema/dmtf/json-schema/ThermalSubsystem.v1_3_3.json
+++ b/redfish-core/schema/dmtf/json-schema/ThermalSubsystem.v1_4_0.json
@@ -1,8 +1,8 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/ThermalSubsystem.v1_3_3.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/ThermalSubsystem.v1_4_0.json",
     "$ref": "#/definitions/ThermalSubsystem",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
-    "copyright": "Copyright 2014-2024 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
+    "copyright": "Copyright 2014-2025 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
     "definitions": {
         "Actions": {
             "additionalProperties": false,
@@ -129,6 +129,13 @@
                     "longDescription": "This property shall contain a link to a resource collection of type `FanCollection`.",
                     "readonly": true
                 },
+                "Filters": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/FilterCollection.json#/definitions/FilterCollection",
+                    "description": "A link to the filters for this equipment.",
+                    "longDescription": "This property shall contain a link to a resource collection of type `FilterCollection` that contains the filters for this equipment.",
+                    "readonly": true,
+                    "versionAdded": "v1_4_0"
+                },
                 "Heaters": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/HeaterCollection.json#/definitions/HeaterCollection",
                     "description": "The link to the collection of heaters within this subsystem.",
@@ -143,7 +150,7 @@
                 "LeakDetection": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/LeakDetection.json#/definitions/LeakDetection",
                     "description": "The link to the leak detection system within this chassis.",
-                    "longDescription": "This property shall contain a link to a resource of type `LeakDetection`.  This link should be used when the leak detection capabilities are tied to, or are internal to, a particular `Chassis`.  For detection capabilties that are tied to a `CoolingUnit` resource, which may span multiple `Chassis` resources, populating the `LeakDetection` resource under `CoolingUnit` for the relevant equipment is the preferred approach.",
+                    "longDescription": "This property shall contain a link to a resource of type `LeakDetection`.  This link should be used when the leak detection capabilities are tied to, or are internal to, a particular `Chassis`.  For detection capabilities that are tied to a `CoolingUnit` resource, which may span multiple `Chassis` resources, populating the `LeakDetection` resource under `CoolingUnit` for the relevant equipment is the preferred approach.",
                     "readonly": true,
                     "versionAdded": "v1_3_0"
                 },
@@ -186,6 +193,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2023.2",
-    "title": "#ThermalSubsystem.v1_3_3.ThermalSubsystem"
+    "release": "2025.2",
+    "title": "#ThermalSubsystem.v1_4_0.ThermalSubsystem"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/TrustedComponent.v1_3_2.json b/redfish-core/schema/dmtf/json-schema/TrustedComponent.v1_4_0.json
similarity index 97%
rename from redfish-core/schema/dmtf/json-schema/TrustedComponent.v1_3_2.json
rename to redfish-core/schema/dmtf/json-schema/TrustedComponent.v1_4_0.json
index ab5ecee..8e03b69 100644
--- a/redfish-core/schema/dmtf/json-schema/TrustedComponent.v1_3_2.json
+++ b/redfish-core/schema/dmtf/json-schema/TrustedComponent.v1_4_0.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/TrustedComponent.v1_3_2.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/TrustedComponent.v1_4_0.json",
     "$ref": "#/definitions/TrustedComponent",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2025 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -332,6 +332,12 @@
                     "description": "The links to other resources that are related to this resource.",
                     "longDescription": "This property shall contain links to resources that are related to but are not contained by, or subordinate to, this resource."
                 },
+                "Location": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Location",
+                    "description": "The location of the trusted component.",
+                    "longDescription": "This property shall contain the location information of the trusted component.",
+                    "versionAdded": "v1_4_0"
+                },
                 "Manufacturer": {
                     "description": "The manufacturer of this trusted component.",
                     "longDescription": "This property shall contain the name of the organization responsible for producing the trusted component.  This organization may be the entity from whom the trusted component is purchased, but this is not necessarily true.",
@@ -444,6 +450,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2023.3",
-    "title": "#TrustedComponent.v1_3_2.TrustedComponent"
+    "release": "2025.2",
+    "title": "#TrustedComponent.v1_4_0.TrustedComponent"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/UpdateService.v1_15_0.json b/redfish-core/schema/dmtf/json-schema/UpdateService.v1_16_0.json
similarity index 92%
rename from redfish-core/schema/dmtf/json-schema/UpdateService.v1_15_0.json
rename to redfish-core/schema/dmtf/json-schema/UpdateService.v1_16_0.json
index 9324c4d..b70dd20 100644
--- a/redfish-core/schema/dmtf/json-schema/UpdateService.v1_15_0.json
+++ b/redfish-core/schema/dmtf/json-schema/UpdateService.v1_16_0.json
@@ -1,8 +1,8 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/UpdateService.v1_15_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/UpdateService.v1_16_0.json",
     "$ref": "#/definitions/UpdateService",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
-    "copyright": "Copyright 2014-2024 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
+    "copyright": "Copyright 2014-2025 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
     "definitions": {
         "Actions": {
             "additionalProperties": false,
@@ -23,6 +23,9 @@
                 }
             },
             "properties": {
+                "#UpdateService.Activate": {
+                    "$ref": "#/definitions/Activate"
+                },
                 "#UpdateService.GenerateSSHIdentityKeyPair": {
                     "$ref": "#/definitions/GenerateSSHIdentityKeyPair"
                 },
@@ -43,6 +46,49 @@
             },
             "type": "object"
         },
+        "Activate": {
+            "additionalProperties": false,
+            "description": "This action activates specified software inventory instance.",
+            "longDescription": "This action shall activate specified software inventory instance.",
+            "parameters": {
+                "Targets": {
+                    "description": "The target software inventory instances to activate on staged devices.",
+                    "items": {
+                        "$ref": "http://redfish.dmtf.org/schemas/v1/SoftwareInventory.json#/definitions/SoftwareInventory"
+                    },
+                    "longDescription": "This parameter shall contain an array of target software inventory instances to activate on staged devices.  The service shall activate each software image on all applicable devices.",
+                    "requiredParameter": true,
+                    "type": "array"
+                }
+            },
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "target": {
+                    "description": "Link to invoke action",
+                    "format": "uri-reference",
+                    "type": "string"
+                },
+                "title": {
+                    "description": "Friendly action name",
+                    "type": "string"
+                }
+            },
+            "type": "object",
+            "versionAdded": "v1_16_0"
+        },
         "ApplyTime": {
             "enum": [
                 "Immediate",
@@ -283,6 +329,12 @@
                     "type": "string",
                     "versionAdded": "v1_4_0"
                 },
+                "Stage": {
+                    "description": "An indication of whether the service stages the image on target devices for a client to activate at a later time.",
+                    "longDescription": "This parameter shall indicate whether the service stages the image on target devices for a client to activate at a later time with the `Activate` action on the `SoftwareInventory` resource.  If the client does not provide this parameter, the service shall default this value to `false`.",
+                    "type": "boolean",
+                    "versionAdded": "v1_16_0"
+                },
                 "Targets": {
                     "description": "An array of URIs that indicate where to apply the update image.",
                     "format": "uri-reference",
@@ -461,6 +513,13 @@
                     "longDescription": "This property shall contain the OEM extensions.  All values for properties contained in this object shall conform to the Redfish Specification-described requirements.",
                     "versionAdded": "v1_8_0"
                 },
+                "Stage": {
+                    "description": "An indication of whether the service stages the image on target devices for a client to activate at a later time.",
+                    "longDescription": "This property shall indicate whether the service stages the image on target devices for a client to activate at a later time with the `Activate` action on the `SoftwareInventory` resource.  If the client does not provide this parameter, the service shall default this value to `false`.",
+                    "readonly": false,
+                    "type": "boolean",
+                    "versionAdded": "v1_16_0"
+                },
                 "Targets": {
                     "description": "An array of URIs that indicate where to apply the update image.",
                     "format": "uri-reference",
@@ -686,6 +745,13 @@
                     "type": "array",
                     "versionAdded": "v1_13_0"
                 },
+                "UpdateServiceCapabilities": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/UpdateServiceCapabilities.json#/definitions/UpdateServiceCapabilities",
+                    "description": "A link to the capabilities of the update service.",
+                    "longDescription": "This property shall contain a link to a resource of type `UpdateServiceCapabilities` that contains the capabilities of the update service.",
+                    "readonly": true,
+                    "versionAdded": "v1_16_0"
+                },
                 "VerifyRemoteServerCertificate": {
                     "description": "An indication of whether the service will verify the certificate of the server referenced by the `ImageURI` parameter in `SimpleUpdate` prior to sending the transfer request.",
                     "longDescription": "This property shall indicate whether the service will verify the certificate of the server referenced by the `ImageURI` parameter in `SimpleUpdate` prior to sending the transfer request with the certificates found in the collection referenced by the `RemoteServerCertificates` property.  If this property is not supported by the service, it shall be assumed to be `false`.  This property should default to `false` in order to maintain compatibility with older clients.  Regardless of the value of this property, services may perform additional verification based on other factors, such as the configuration of the `SecurityPolicy` resource.",
@@ -718,6 +784,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2024.4",
-    "title": "#UpdateService.v1_15_0.UpdateService"
+    "release": "2025.2",
+    "title": "#UpdateService.v1_16_0.UpdateService"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/ThermalEquipment.v1_1_2.json b/redfish-core/schema/dmtf/json-schema/UpdateServiceCapabilities.v1_0_0.json
similarity index 62%
copy from redfish-core/schema/dmtf/json-schema/ThermalEquipment.v1_1_2.json
copy to redfish-core/schema/dmtf/json-schema/UpdateServiceCapabilities.v1_0_0.json
index b9f44f3..00667be 100644
--- a/redfish-core/schema/dmtf/json-schema/ThermalEquipment.v1_1_2.json
+++ b/redfish-core/schema/dmtf/json-schema/UpdateServiceCapabilities.v1_0_0.json
@@ -1,8 +1,8 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/ThermalEquipment.v1_1_2.json",
-    "$ref": "#/definitions/ThermalEquipment",
+    "$id": "http://redfish.dmtf.org/schemas/v1/UpdateServiceCapabilities.v1_0_0.json",
+    "$ref": "#/definitions/UpdateServiceCapabilities",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
-    "copyright": "Copyright 2014-2024 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
+    "copyright": "Copyright 2014-2025 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
     "definitions": {
         "Actions": {
             "additionalProperties": false,
@@ -52,10 +52,10 @@
             "properties": {},
             "type": "object"
         },
-        "ThermalEquipment": {
+        "UpdateServiceCapabilities": {
             "additionalProperties": false,
-            "description": "The `ThermalEquipment` schema represents the set of cooling equipment managed by a Redfish service.",
-            "longDescription": "This resource shall represent the set of cooling equipment for a Redfish implementation.",
+            "description": "The `UpdateServiceCapabilities` schema contains capabilities of the update service.",
+            "longDescription": "This resource shall represent the update service capabilities for a Redfish implementation.",
             "patternProperties": {
                 "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
                     "description": "This property shall specify a valid odata or Redfish property.",
@@ -88,26 +88,23 @@
                     "description": "The available actions for this resource.",
                     "longDescription": "This property shall contain the available actions for this resource."
                 },
-                "CDUs": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/CoolingUnitCollection.json#/definitions/CoolingUnitCollection",
-                    "description": "A link to a collection of coolant distribution units.",
-                    "longDescription": "This property shall contain a link to a resource collection of type `CoolingUnitCollection` that contains a set of coolant distribution units.",
-                    "readonly": true
-                },
-                "CoolingLoopRedundancy": {
-                    "description": "The redundancy information for cooling loops attached to this equipment.",
+                "AllowableStaging": {
+                    "description": "The allowable URIs that a client can specify in the `Targets` parameter for update requests when requesting to stage an image on target devices.",
                     "items": {
-                        "$ref": "http://redfish.dmtf.org/schemas/v1/Redundancy.json#/definitions/RedundantGroup"
+                        "type": "string"
                     },
-                    "longDescription": "This property shall contain redundancy information for the set of cooling loops attached to this equipment.  The values of the `RedundancyGroup` array shall reference resources of type `CoolingLoop`.",
-                    "type": "array",
-                    "versionAdded": "v1_1_0"
+                    "longDescription": "This property shall contain an array of the allowable URIs that a client can specify in the `Targets` parameter for `SimpleUpdate` or `MultipartHttpPushUri` update requests with `Stage` set to `true`.",
+                    "readonly": true,
+                    "type": "array"
                 },
-                "CoolingLoops": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/CoolingLoopCollection.json#/definitions/CoolingLoopCollection",
-                    "description": "A link to a collection of cooling loops.",
-                    "longDescription": "This property shall contain a link to a resource collection of type `CoolingLoopCollection` that contains the set of cooling loops managed by the service.",
-                    "readonly": true
+                "AllowableTargets": {
+                    "description": "The allowable URIs that a client can specify in the `Targets` parameter for update requests.",
+                    "items": {
+                        "type": "string"
+                    },
+                    "longDescription": "This property shall contain an array of the allowable URIs that a client can specify in the `Targets` parameter for `SimpleUpdate` or `MultipartHttpPushUri` update requests.",
+                    "readonly": true,
+                    "type": "array"
                 },
                 "Description": {
                     "anyOf": [
@@ -120,22 +117,10 @@
                     ],
                     "readonly": true
                 },
-                "HeatExchangers": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/CoolingUnitCollection.json#/definitions/CoolingUnitCollection",
-                    "description": "A link to a collection of heat exchanger units.",
-                    "longDescription": "This property shall contain a link to a resource collection of type `CoolingUnitCollection` that contains a set of heat exchanger units.",
-                    "readonly": true
-                },
                 "Id": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Id",
                     "readonly": true
                 },
-                "ImmersionUnits": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/CoolingUnitCollection.json#/definitions/CoolingUnitCollection",
-                    "description": "A link to a collection of immersion cooling units.",
-                    "longDescription": "This property shall contain a link to a resource collection of type `CoolingUnitCollection` that contains a set of immersion cooling units.",
-                    "readonly": true
-                },
                 "Name": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Name",
                     "readonly": true
@@ -144,11 +129,6 @@
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Oem",
                     "description": "The OEM extension property.",
                     "longDescription": "This property shall contain the OEM extensions.  All values for properties that this object contains shall conform to the Redfish Specification-described requirements."
-                },
-                "Status": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Status",
-                    "description": "The status and health of the resource and its subordinate or dependent resources.",
-                    "longDescription": "This property shall contain any status or health properties of the resource."
                 }
             },
             "required": [
@@ -162,6 +142,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2023.2",
-    "title": "#ThermalEquipment.v1_1_2.ThermalEquipment"
+    "release": "2025.2",
+    "title": "#UpdateServiceCapabilities.v1_0_0.UpdateServiceCapabilities"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/JobService.v1_0_6.json b/redfish-core/schema/dmtf/json-schema/VirtualCXLSwitch.v1_0_0.json
similarity index 66%
rename from redfish-core/schema/dmtf/json-schema/JobService.v1_0_6.json
rename to redfish-core/schema/dmtf/json-schema/VirtualCXLSwitch.v1_0_0.json
index e7ab95f..c53c621 100644
--- a/redfish-core/schema/dmtf/json-schema/JobService.v1_0_6.json
+++ b/redfish-core/schema/dmtf/json-schema/VirtualCXLSwitch.v1_0_0.json
@@ -1,8 +1,8 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/JobService.v1_0_6.json",
-    "$ref": "#/definitions/JobService",
+    "$id": "http://redfish.dmtf.org/schemas/v1/VirtualCXLSwitch.v1_0_0.json",
+    "$ref": "#/definitions/VirtualCXLSwitch",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
-    "copyright": "Copyright 2014-2024 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
+    "copyright": "Copyright 2014-2025 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
     "definitions": {
         "Actions": {
             "additionalProperties": false,
@@ -31,10 +31,76 @@
             },
             "type": "object"
         },
-        "JobService": {
+        "Links": {
             "additionalProperties": false,
-            "description": "The `JobService` schema contains properties for scheduling and execution of operations, represents the properties for the job service itself, and has links to jobs managed by the job service.",
-            "longDescription": "This resource shall represent a job service for a Redfish implementation.",
+            "description": "The links to other resources that are related to this resource.",
+            "longDescription": "This Redfish Specification-described type shall contain links to resources that are related to but are not contained by, or subordinate to, this resource.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "Endpoints": {
+                    "description": "The links to the endpoints designated for this Virtual CXL Switch.",
+                    "items": {
+                        "$ref": "http://redfish.dmtf.org/schemas/v1/Endpoint.json#/definitions/Endpoint"
+                    },
+                    "longDescription": "This property shall contain an array of links to resources of type `Endpoint` that represent the endpoints for this Virtual CXL Switch.",
+                    "readonly": true,
+                    "type": "array"
+                },
+                "Endpoints@odata.count": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
+                },
+                "Oem": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Oem",
+                    "description": "The OEM extension property.",
+                    "longDescription": "This property shall contain the OEM extensions.  All values for properties contained in this object shall conform to the Redfish Specification-described requirements."
+                },
+                "Port": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Port.json#/definitions/Port",
+                    "description": "The link to the local upstream port of the switch that is physically connected to a host or another switch for this Virtual CXL Switch.",
+                    "longDescription": "This property shall contain a link to a resource of type `Port` that represents the local upstream port of the switch that is physically connected to a host or another switch for this Virtual CXL Switch.",
+                    "readonly": true
+                }
+            },
+            "type": "object"
+        },
+        "OemActions": {
+            "additionalProperties": true,
+            "description": "The available OEM-specific actions for this resource.",
+            "longDescription": "This type shall contain the available OEM-specific actions for this resource.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {},
+            "type": "object"
+        },
+        "VirtualCXLSwitch": {
+            "additionalProperties": false,
+            "description": "The Virtual CXL Switch describes the virtual component with the CXL switch that is governed by a list of rules as prescribed in the CXL specification.",
+            "longDescription": "This resource shall represent a VCS entity within a CXL switch.  The CXL Specification contains the complete definition of a Virtual CXL Switch.",
             "patternProperties": {
                 "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
                     "description": "This property shall specify a valid odata or Redfish property.",
@@ -67,16 +133,6 @@
                     "description": "The available actions for this resource.",
                     "longDescription": "This property shall contain the available actions for this resource."
                 },
-                "DateTime": {
-                    "description": "The current date and time setting for the job service.",
-                    "format": "date-time",
-                    "longDescription": "This property shall contain the current date and time setting for the job service.",
-                    "readonly": true,
-                    "type": [
-                        "string",
-                        "null"
-                    ]
-                },
                 "Description": {
                     "anyOf": [
                         {
@@ -88,21 +144,20 @@
                     ],
                     "readonly": true
                 },
+                "HDMDecoders": {
+                    "description": "The number of HDM (Host Device Memory) decoders present in this Virtual CXL Switch.",
+                    "longDescription": "The number of HDM (Host Device Memory) decoders present in this Virtual CXL Switch.",
+                    "readonly": true,
+                    "type": "integer"
+                },
                 "Id": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Id",
                     "readonly": true
                 },
-                "Jobs": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/JobCollection.json#/definitions/JobCollection",
-                    "description": "The links to the jobs collection.",
-                    "longDescription": "This property shall contain a link to a resource collection of type `JobCollection`.",
-                    "readonly": true
-                },
-                "Log": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/LogService.json#/definitions/LogService",
-                    "description": "The link to a log service that the job service uses.  This service can be a dedicated log service or a pointer to a log service under another resource, such as a manager.",
-                    "longDescription": "This property shall contain a link to a resource of type `LogService` that this job service uses.",
-                    "readonly": true
+                "Links": {
+                    "$ref": "#/definitions/Links",
+                    "description": "The links to other resources that are related to this resource.",
+                    "longDescription": "This property shall contain links to resources that are related to but are not contained by, or subordinate to, this resource."
                 },
                 "Name": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Name",
@@ -113,24 +168,22 @@
                     "description": "The OEM extension property.",
                     "longDescription": "This property shall contain the OEM extensions.  All values for properties that this object contains shall conform to the Redfish Specification-described requirements."
                 },
-                "ServiceCapabilities": {
-                    "$ref": "#/definitions/JobServiceCapabilities",
-                    "description": "The supported capabilities of this job service implementation.",
-                    "longDescription": "This type shall contain properties that describe the capabilities or supported features of this implementation of a job service."
-                },
-                "ServiceEnabled": {
-                    "description": "An indication of whether this service is enabled.",
-                    "longDescription": "This property shall indicate whether this service is enabled.",
-                    "readonly": false,
-                    "type": [
-                        "boolean",
-                        "null"
-                    ]
-                },
                 "Status": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Status",
                     "description": "The status and health of the resource and its subordinate or dependent resources.",
                     "longDescription": "This property shall contain any status or health properties of the resource."
+                },
+                "VCSId": {
+                    "description": "The Virtual CXL Switch identifier.",
+                    "longDescription": "This property shall contain the identifier of the Virtual CXL Switch.",
+                    "readonly": true,
+                    "type": "string"
+                },
+                "VPPBs": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/VirtualPCI2PCIBridgeCollection.json#/definitions/VirtualPCI2PCIBridgeCollection",
+                    "description": "The link to the collection of vPPBs (Virtual PCI-to-PCI Bridges) for this Virtual CXL Switch.",
+                    "longDescription": "This property shall contain a link to a resource collection of type `VirtualPCI2PCIBridgeCollection`.",
+                    "readonly": true
                 }
             },
             "required": [
@@ -140,80 +193,9 @@
                 "Name"
             ],
             "type": "object"
-        },
-        "JobServiceCapabilities": {
-            "additionalProperties": false,
-            "description": "The supported capabilities of this job service implementation.",
-            "longDescription": "This type shall contain properties that describe the capabilities or supported features of this implementation of a job service.",
-            "patternProperties": {
-                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
-                    "description": "This property shall specify a valid odata or Redfish property.",
-                    "type": [
-                        "array",
-                        "boolean",
-                        "integer",
-                        "number",
-                        "null",
-                        "object",
-                        "string"
-                    ]
-                }
-            },
-            "properties": {
-                "MaxJobs": {
-                    "description": "The maximum number of jobs supported.",
-                    "longDescription": "This property shall contain the maximum number of jobs supported by the implementation.",
-                    "readonly": true,
-                    "type": [
-                        "integer",
-                        "null"
-                    ]
-                },
-                "MaxSteps": {
-                    "description": "The maximum number of job steps supported.",
-                    "longDescription": "This property shall contain the maximum number of steps supported by a single job instance.",
-                    "readonly": true,
-                    "type": [
-                        "integer",
-                        "null"
-                    ]
-                },
-                "Scheduling": {
-                    "description": "An indication of whether scheduling of jobs is supported.",
-                    "longDescription": "This property shall indicate whether the `Schedule` property within the job supports scheduling of jobs.",
-                    "readonly": true,
-                    "type": [
-                        "boolean",
-                        "null"
-                    ]
-                }
-            },
-            "type": "object"
-        },
-        "OemActions": {
-            "additionalProperties": true,
-            "description": "The available OEM-specific actions for this resource.",
-            "longDescription": "This type shall contain the available OEM-specific actions for this resource.",
-            "patternProperties": {
-                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
-                    "description": "This property shall specify a valid odata or Redfish property.",
-                    "type": [
-                        "array",
-                        "boolean",
-                        "integer",
-                        "number",
-                        "null",
-                        "object",
-                        "string"
-                    ]
-                }
-            },
-            "properties": {},
-            "type": "object"
         }
     },
-    "language": "en",
     "owningEntity": "DMTF",
-    "release": "2018.2",
-    "title": "#JobService.v1_0_6.JobService"
+    "release": "2025.2",
+    "title": "#VirtualCXLSwitch.v1_0_0.VirtualCXLSwitch"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/VirtualCXLSwitchCollection.json b/redfish-core/schema/dmtf/json-schema/VirtualCXLSwitchCollection.json
new file mode 100644
index 0000000..cb5e0e3
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema/VirtualCXLSwitchCollection.json
@@ -0,0 +1,99 @@
+{
+    "$id": "http://redfish.dmtf.org/schemas/v1/VirtualCXLSwitchCollection.json",
+    "$ref": "#/definitions/VirtualCXLSwitchCollection",
+    "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
+    "copyright": "Copyright 2014-2025 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
+    "definitions": {
+        "VirtualCXLSwitchCollection": {
+            "anyOf": [
+                {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/idRef"
+                },
+                {
+                    "additionalProperties": false,
+                    "description": "The collection of `VirtualCXLSwitch` resource instances.",
+                    "longDescription": "This resource shall represent a resource collection of `VirtualCXLSwitch` instances for a Redfish implementation.",
+                    "patternProperties": {
+                        "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                            "description": "This property shall specify a valid odata or Redfish property.",
+                            "type": [
+                                "array",
+                                "boolean",
+                                "integer",
+                                "number",
+                                "null",
+                                "object",
+                                "string"
+                            ]
+                        }
+                    },
+                    "properties": {
+                        "@odata.context": {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/context"
+                        },
+                        "@odata.etag": {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/etag"
+                        },
+                        "@odata.id": {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/id"
+                        },
+                        "@odata.type": {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/type"
+                        },
+                        "Description": {
+                            "anyOf": [
+                                {
+                                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Description"
+                                },
+                                {
+                                    "type": "null"
+                                }
+                            ],
+                            "readonly": true
+                        },
+                        "Members": {
+                            "description": "The members of this collection.",
+                            "items": {
+                                "$ref": "http://redfish.dmtf.org/schemas/v1/VirtualCXLSwitch.json#/definitions/VirtualCXLSwitch"
+                            },
+                            "longDescription": "This property shall contain an array of links to the members of this collection.",
+                            "readonly": true,
+                            "type": "array"
+                        },
+                        "Members@odata.count": {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
+                        },
+                        "Members@odata.nextLink": {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/nextLink"
+                        },
+                        "Name": {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Name",
+                            "readonly": true
+                        },
+                        "Oem": {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Oem",
+                            "description": "The OEM extension property.",
+                            "longDescription": "This property shall contain the OEM extensions.  All values for properties contained in this object shall conform to the Redfish Specification-described requirements."
+                        }
+                    },
+                    "required": [
+                        "Members",
+                        "Members@odata.count",
+                        "@odata.id",
+                        "@odata.type",
+                        "Name"
+                    ],
+                    "type": "object"
+                }
+            ],
+            "deletable": false,
+            "insertable": false,
+            "updatable": false,
+            "uris": [
+                "/redfish/v1/Fabrics/{FabricId}/Switches/{SwitchId}/VCSs"
+            ]
+        }
+    },
+    "owningEntity": "DMTF",
+    "title": "#VirtualCXLSwitchCollection.VirtualCXLSwitchCollection"
+}
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/Fabric.v1_3_2.json b/redfish-core/schema/dmtf/json-schema/VirtualPCI2PCIBridge.v1_0_0.json
similarity index 65%
copy from redfish-core/schema/dmtf/json-schema/Fabric.v1_3_2.json
copy to redfish-core/schema/dmtf/json-schema/VirtualPCI2PCIBridge.v1_0_0.json
index 5725ef1..ad75e70 100644
--- a/redfish-core/schema/dmtf/json-schema/Fabric.v1_3_2.json
+++ b/redfish-core/schema/dmtf/json-schema/VirtualPCI2PCIBridge.v1_0_0.json
@@ -1,8 +1,8 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Fabric.v1_3_2.json",
-    "$ref": "#/definitions/Fabric",
+    "$id": "http://redfish.dmtf.org/schemas/v1/VirtualPCI2PCIBridge.v1_0_0.json",
+    "$ref": "#/definitions/VirtualPCI2PCIBridge",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
-    "copyright": "Copyright 2014-2024 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
+    "copyright": "Copyright 2014-2025 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
     "definitions": {
         "Actions": {
             "additionalProperties": false,
@@ -31,10 +31,83 @@
             },
             "type": "object"
         },
-        "Fabric": {
+        "Links": {
             "additionalProperties": false,
-            "description": "The `Fabric` schema represents a simple fabric consisting of one or more switches, zero or more endpoints, and zero or more zones.",
-            "longDescription": "This resource shall represent a simple switchable fabric for a Redfish implementation.",
+            "description": "The links to other resources that are related to this resource.",
+            "longDescription": "This Redfish Specification-described type shall contain links to resources that are related to but are not contained by, or subordinate to, this resource.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "Endpoints": {
+                    "description": "The links to the endpoints associated with this vPPB.",
+                    "items": {
+                        "$ref": "http://redfish.dmtf.org/schemas/v1/Endpoint.json#/definitions/Endpoint"
+                    },
+                    "longDescription": "This property shall contain an array of links to resources of type `Endpoint` that represent the endpoints associated with this vPPB.",
+                    "readonly": true,
+                    "type": "array"
+                },
+                "Endpoints@odata.count": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
+                },
+                "Oem": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Oem",
+                    "description": "The OEM extension property.",
+                    "longDescription": "This property shall contain the OEM extensions.  All values for properties contained in this object shall conform to the Redfish Specification-described requirements."
+                },
+                "Port": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Port.json#/definitions/Port"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The link to the port associated with this vPPB.",
+                    "longDescription": "This property shall contain a link to a resource of type `Port` that represents the port associated with this vPPB.",
+                    "readonly": false
+                }
+            },
+            "type": "object"
+        },
+        "OemActions": {
+            "additionalProperties": true,
+            "description": "The available OEM-specific actions for this resource.",
+            "longDescription": "This type shall contain the available OEM-specific actions for this resource.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {},
+            "type": "object"
+        },
+        "VirtualPCI2PCIBridge": {
+            "additionalProperties": false,
+            "description": "The `VirtualPCI2PCIBridge` schema describes Virtual PCI-to-PCI Bridge (vPPB) inside a CXL switch that is owned by the host.",
+            "longDescription": "This resource shall represent a Virtual PCI-to-PCI Bridge (vPPB) inside a CXL switch that is host-owned.  This can be bound to a port that is either disconnected, connected to a PCIe component, or connected to a CXL component.",
             "patternProperties": {
                 "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
                     "description": "This property shall specify a valid odata or Redfish property.",
@@ -67,19 +140,29 @@
                     "description": "The available actions for this resource.",
                     "longDescription": "This property shall contain the available actions for this resource."
                 },
-                "AddressPools": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/AddressPoolCollection.json#/definitions/AddressPoolCollection",
-                    "description": "The collection of links to the address pools that this fabric contains.",
-                    "longDescription": "This property shall contain a link to a resource collection of type `AddressPoolCollection`.",
-                    "readonly": true,
-                    "versionAdded": "v1_1_0"
+                "BindingStatus": {
+                    "$ref": "#/definitions/vPPBStatusTypes",
+                    "description": "The binding status of the vPPB.",
+                    "longDescription": "This property shall contain the binding status of the vPPB.",
+                    "readonly": true
                 },
-                "Connections": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/ConnectionCollection.json#/definitions/ConnectionCollection",
-                    "description": "The collection of links to the connections that this fabric contains.",
-                    "longDescription": "This property shall contain a link to a resource collection of type `ConnectionCollection`.",
+                "BoundLDId": {
+                    "description": "The identifier of the bound local logical device.",
+                    "longDescription": "This property shall contain the identifier of the bound local logical device bound to this vPPB.  This property shall only be present if `BindingStatus` contains `BoundLD`.",
                     "readonly": true,
-                    "versionAdded": "v1_2_0"
+                    "type": "integer"
+                },
+                "BoundPBRId": {
+                    "description": "The identifier of the bound PBR.",
+                    "longDescription": "This property shall contain the identifier of PBR bound to this vPPB.  This property shall only be present if `BindingStatus` contains `BoundPID`.",
+                    "readonly": true,
+                    "type": "integer"
+                },
+                "BoundPortId": {
+                    "description": "The physical port number of the bound port.",
+                    "longDescription": "This property shall contain the physical port number of the port bound to this vPPB.  This property shall only be present if `BindingStatus` contains `BoundPhysicalPort` or `BoundLD`.",
+                    "readonly": true,
+                    "type": "integer"
                 },
                 "Description": {
                     "anyOf": [
@@ -92,31 +175,15 @@
                     ],
                     "readonly": true
                 },
-                "EndpointGroups": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/EndpointGroupCollection.json#/definitions/EndpointGroupCollection",
-                    "description": "The collection of links to the endpoint groups that this fabric contains.",
-                    "longDescription": "This property shall contain a link to a resource collection of type `EndpointGroupCollection`.",
+                "GCXLID": {
+                    "description": "The GCXLID for the CXL logical device bound to this vPPB.",
+                    "longDescription": "This property shall contain the globally unique CXL logical device identifier (GCXLID) for the CXL logical device that is bound to this vPPB.",
+                    "pattern": "^([0-9A-Fa-f]{2}-){7}[0-9A-Fa-f]{2}:([0-9A-Fa-f]{4})$",
                     "readonly": true,
-                    "versionAdded": "v1_2_0"
-                },
-                "Endpoints": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/EndpointCollection.json#/definitions/EndpointCollection",
-                    "description": "The collection of links to the endpoints that this fabric contains.",
-                    "longDescription": "This property shall contain a link to a resource collection of type `EndpointCollection`.",
-                    "readonly": true
-                },
-                "FabricType": {
-                    "anyOf": [
-                        {
-                            "$ref": "http://redfish.dmtf.org/schemas/v1/Protocol.json#/definitions/Protocol"
-                        },
-                        {
-                            "type": "null"
-                        }
-                    ],
-                    "description": "The protocol being sent over this fabric.",
-                    "longDescription": "This property shall contain the type of fabric being represented by this simple fabric.",
-                    "readonly": true
+                    "type": [
+                        "string",
+                        "null"
+                    ]
                 },
                 "Id": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Id",
@@ -127,15 +194,6 @@
                     "description": "The links to other resources that are related to this resource.",
                     "longDescription": "This property shall contain links to resources that are related to but are not contained by, or subordinate to, this resource."
                 },
-                "MaxZones": {
-                    "description": "The maximum number of zones the switch can currently configure.",
-                    "longDescription": "This property shall contain the maximum number of zones the switch can currently configure.  Changes in the logical or physical configuration of the system can change this value.",
-                    "readonly": true,
-                    "type": [
-                        "integer",
-                        "null"
-                    ]
-                },
                 "Name": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Name",
                     "readonly": true
@@ -150,31 +208,14 @@
                     "description": "The status and health of the resource and its subordinate or dependent resources.",
                     "longDescription": "This property shall contain any status or health properties of the resource."
                 },
-                "Switches": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/SwitchCollection.json#/definitions/SwitchCollection",
-                    "description": "The collection of links to the switches that this fabric contains.",
-                    "longDescription": "This property shall contain a link to a resource collection of type `SwitchCollection`.",
-                    "readonly": true
-                },
-                "UUID": {
-                    "anyOf": [
-                        {
-                            "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/UUID"
-                        },
-                        {
-                            "type": "null"
-                        }
-                    ],
-                    "description": "The UUID for this fabric.",
-                    "longDescription": "This property shall contain a universally unique identifier number for the fabric.",
-                    "readonly": false,
-                    "versionAdded": "v1_3_0"
-                },
-                "Zones": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/ZoneCollection.json#/definitions/ZoneCollection",
-                    "description": "The collection of links to the zones that this fabric contains.",
-                    "longDescription": "This property shall contain a link to a resource collection of type `ZoneCollection`.",
-                    "readonly": true
+                "VPPBId": {
+                    "description": "The Virtual PCI-PCI Bridge identifier.",
+                    "longDescription": "This property shall contain the identifier of the vPPB.  This property shall contain the same value as the `Id` property.",
+                    "readonly": true,
+                    "type": [
+                        "string",
+                        "null"
+                    ]
                 }
             },
             "required": [
@@ -185,57 +226,32 @@
             ],
             "type": "object"
         },
-        "Links": {
-            "additionalProperties": false,
-            "description": "The links to other resources that are related to this resource.",
-            "longDescription": "This Redfish Specification-described type shall contain links to resources that are related to but are not contained by, or subordinate to, this resource.",
-            "patternProperties": {
-                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
-                    "description": "This property shall specify a valid odata or Redfish property.",
-                    "type": [
-                        "array",
-                        "boolean",
-                        "integer",
-                        "number",
-                        "null",
-                        "object",
-                        "string"
-                    ]
-                }
+        "vPPBStatusTypes": {
+            "enum": [
+                "Unbound",
+                "Busy",
+                "BoundPhysicalPort",
+                "BoundLD",
+                "BoundPID"
+            ],
+            "enumDescriptions": {
+                "BoundLD": "This vPPB is bound to a CXL logical device.",
+                "BoundPID": "This vPPB is bound to a PBR ID.",
+                "BoundPhysicalPort": "This vPPB is bound to a physical port.",
+                "Busy": "Binding or unbinding is in progress for this vPPB.",
+                "Unbound": "This vPPB is in unbound state."
             },
-            "properties": {
-                "Oem": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Oem",
-                    "description": "The OEM extension property.",
-                    "longDescription": "This property shall contain the OEM extensions.  All values for properties contained in this object shall conform to the Redfish Specification-described requirements."
-                }
+            "enumLongDescriptions": {
+                "BoundLD": "This value shall indicate the CXL Specification-defined 'Bound LD' state for the vPPB.",
+                "BoundPID": "This value shall indicate the CXL Specification-defined 'Bound PBR Id' state for the vPPB.",
+                "BoundPhysicalPort": "This value shall indicate the CXL Specification-defined 'Bound Physical Port' state for the vPPB.",
+                "Busy": "This value shall indicate the CXL Specification-defined 'Binding or Unbinding' state for the vPPB.",
+                "Unbound": "This value shall indicate the CXL Specification-defined 'Unbound' state for the vPPB."
             },
-            "type": "object"
-        },
-        "OemActions": {
-            "additionalProperties": true,
-            "description": "The available OEM-specific actions for this resource.",
-            "longDescription": "This type shall contain the available OEM-specific actions for this resource.",
-            "patternProperties": {
-                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
-                    "description": "This property shall specify a valid odata or Redfish property.",
-                    "type": [
-                        "array",
-                        "boolean",
-                        "integer",
-                        "number",
-                        "null",
-                        "object",
-                        "string"
-                    ]
-                }
-            },
-            "properties": {},
-            "type": "object"
+            "type": "string"
         }
     },
-    "language": "en",
     "owningEntity": "DMTF",
-    "release": "2022.1",
-    "title": "#Fabric.v1_3_2.Fabric"
+    "release": "2025.2",
+    "title": "#VirtualPCI2PCIBridge.v1_0_0.VirtualPCI2PCIBridge"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/VirtualPCI2PCIBridgeCollection.json b/redfish-core/schema/dmtf/json-schema/VirtualPCI2PCIBridgeCollection.json
new file mode 100644
index 0000000..0fa03bd
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema/VirtualPCI2PCIBridgeCollection.json
@@ -0,0 +1,99 @@
+{
+    "$id": "http://redfish.dmtf.org/schemas/v1/VirtualPCI2PCIBridgeCollection.json",
+    "$ref": "#/definitions/VirtualPCI2PCIBridgeCollection",
+    "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
+    "copyright": "Copyright 2014-2025 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
+    "definitions": {
+        "VirtualPCI2PCIBridgeCollection": {
+            "anyOf": [
+                {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/idRef"
+                },
+                {
+                    "additionalProperties": false,
+                    "description": "The collection of `VirtualPCI2PCIBridge` resource instances.",
+                    "longDescription": "This resource shall represent a resource collection of `VirtualPCI2PCIBridge` instances for a Redfish implementation.",
+                    "patternProperties": {
+                        "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                            "description": "This property shall specify a valid odata or Redfish property.",
+                            "type": [
+                                "array",
+                                "boolean",
+                                "integer",
+                                "number",
+                                "null",
+                                "object",
+                                "string"
+                            ]
+                        }
+                    },
+                    "properties": {
+                        "@odata.context": {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/context"
+                        },
+                        "@odata.etag": {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/etag"
+                        },
+                        "@odata.id": {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/id"
+                        },
+                        "@odata.type": {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/type"
+                        },
+                        "Description": {
+                            "anyOf": [
+                                {
+                                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Description"
+                                },
+                                {
+                                    "type": "null"
+                                }
+                            ],
+                            "readonly": true
+                        },
+                        "Members": {
+                            "description": "The members of this collection.",
+                            "items": {
+                                "$ref": "http://redfish.dmtf.org/schemas/v1/VirtualPCI2PCIBridge.json#/definitions/VirtualPCI2PCIBridge"
+                            },
+                            "longDescription": "This property shall contain an array of links to the members of this collection.",
+                            "readonly": true,
+                            "type": "array"
+                        },
+                        "Members@odata.count": {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
+                        },
+                        "Members@odata.nextLink": {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/nextLink"
+                        },
+                        "Name": {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Name",
+                            "readonly": true
+                        },
+                        "Oem": {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Oem",
+                            "description": "The OEM extension property.",
+                            "longDescription": "This property shall contain the OEM extensions.  All values for properties contained in this object shall conform to the Redfish Specification-described requirements."
+                        }
+                    },
+                    "required": [
+                        "Members",
+                        "Members@odata.count",
+                        "@odata.id",
+                        "@odata.type",
+                        "Name"
+                    ],
+                    "type": "object"
+                }
+            ],
+            "deletable": false,
+            "insertable": false,
+            "updatable": false,
+            "uris": [
+                "/redfish/v1/Fabrics/{FabricId}/Switches/{SwitchId}/VCSs/{VirtualCXLSwitchId}/VPPBs"
+            ]
+        }
+    },
+    "owningEntity": "DMTF",
+    "title": "#VirtualPCI2PCIBridgeCollection.VirtualPCI2PCIBridgeCollection"
+}
\ No newline at end of file
diff --git a/scripts/update_schemas.py b/scripts/update_schemas.py
index 6fde032..85eb23c 100755
--- a/scripts/update_schemas.py
+++ b/scripts/update_schemas.py
@@ -9,7 +9,7 @@
 import requests
 from generate_schema_collections import generate_top_collections
 
-VERSION = "DSP8010_2025.1"
+VERSION = "DSP8010_2025.2"
 
 SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))