s2-python 0.0.1__py3-none-any.whl → 0.1.3__py3-none-any.whl

s2python/generated/gen_s2.py

@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  openapi.yml
-#   timestamp: 2023-07-31T15:51:31+00:00
+#   timestamp: 2024-12-02T15:28:08+00:00
 
 from __future__ import annotations
 
@@ -11,34 +11,21 @@ from typing import List, Optional
 from pydantic import BaseModel, Extra, Field, conint, constr
 
 
-class Commodity(Enum):
-    GAS = "GAS"
-    HEAT = "HEAT"
-    ELECTRICITY = "ELECTRICITY"
-    OIL = "OIL"
+class Duration(BaseModel):
+    __root__: conint(ge=0) = Field(..., description="Duration in milliseconds")
 
 
-class CommodityQuantity(Enum):
-    ELECTRIC_POWER_L1 = "ELECTRIC.POWER.L1"
-    ELECTRIC_POWER_L2 = "ELECTRIC.POWER.L2"
-    ELECTRIC_POWER_L3 = "ELECTRIC.POWER.L3"
-    ELECTRIC_POWER_3_PHASE_SYMMETRIC = "ELECTRIC.POWER.3_PHASE_SYMMETRIC"
-    NATURAL_GAS_FLOW_RATE = "NATURAL_GAS.FLOW_RATE"
-    HYDROGEN_FLOW_RATE = "HYDROGEN.FLOW_RATE"
-    HEAT_TEMPERATURE = "HEAT.TEMPERATURE"
-    HEAT_FLOW_RATE = "HEAT.FLOW_RATE"
-    HEAT_THERMAL_POWER = "HEAT.THERMAL_POWER"
-    OIL_FLOW_RATE = "OIL.FLOW_RATE"
+class ID(BaseModel):
+    __root__: constr(regex=r"[a-zA-Z0-9\-_:]{2,64}") = Field(..., description="UUID")
 
+    def __eq__(self, __value: object) -> bool:
+        if isinstance(__value, str):
+            return self.__root__ == __value
+        else:
+            return super().__eq__(__value)
 
-class ControlType(Enum):
-    POWER_ENVELOPE_BASED_CONTROL = "POWER_ENVELOPE_BASED_CONTROL"
-    POWER_PROFILE_BASED_CONTROL = "POWER_PROFILE_BASED_CONTROL"
-    OPERATION_MODE_BASED_CONTROL = "OPERATION_MODE_BASED_CONTROL"
-    FILL_RATE_BASED_CONTROL = "FILL_RATE_BASED_CONTROL"
-    DEMAND_DRIVEN_BASED_CONTROL = "DEMAND_DRIVEN_BASED_CONTROL"
-    NOT_CONTROLABLE = "NOT_CONTROLABLE"
-    NO_SELECTION = "NO_SELECTION"
+    def __hash__(self) -> int:
+        return hash(self.__root__)
 
 
 class Currency(Enum):
@@ -144,8 +131,25 @@ class Currency(Enum):
     ZWL = "ZWL"
 
 
-class Duration(BaseModel):
-    __root__: conint(ge=0) = Field(..., description="Duration in milliseconds")
+class SessionRequestType(Enum):
+    RECONNECT = "RECONNECT"
+    TERMINATE = "TERMINATE"
+
+
+class RevokableObjects(Enum):
+    PEBC_PowerConstraints = "PEBC.PowerConstraints"
+    PEBC_EnergyConstraint = "PEBC.EnergyConstraint"
+    PEBC_Instruction = "PEBC.Instruction"
+    PPBC_PowerProfileDefinition = "PPBC.PowerProfileDefinition"
+    PPBC_ScheduleInstruction = "PPBC.ScheduleInstruction"
+    PPBC_StartInterruptionInstruction = "PPBC.StartInterruptionInstruction"
+    PPBC_EndInterruptionInstruction = "PPBC.EndInterruptionInstruction"
+    OMBC_SystemDescription = "OMBC.SystemDescription"
+    OMBC_Instruction = "OMBC.Instruction"
+    FRBC_SystemDescription = "FRBC.SystemDescription"
+    FRBC_Instruction = "FRBC.Instruction"
+    DDBC_SystemDescription = "DDBC.SystemDescription"
+    DDBC_Instruction = "DDBC.Instruction"
 
 
 class EnergyManagementRole(Enum):
@@ -153,200 +157,277 @@ class EnergyManagementRole(Enum):
     RM = "RM"
 
 
-class FRBCUsageForecastElement(BaseModel):
+class ReceptionStatusValues(Enum):
+    INVALID_DATA = "INVALID_DATA"
+    INVALID_MESSAGE = "INVALID_MESSAGE"
+    INVALID_CONTENT = "INVALID_CONTENT"
+    TEMPORARY_ERROR = "TEMPORARY_ERROR"
+    PERMANENT_ERROR = "PERMANENT_ERROR"
+    OK = "OK"
+
+
+class NumberRange(BaseModel):
     class Config:
         extra = Extra.forbid
 
-    duration: Duration = Field(
-        ..., description="Indicator for how long the given usage_rate is valid."
+    start_of_range: float = Field(
+        ..., description="Number that defines the start of the range"
     )
-    usage_rate_expected: float = Field(
+    end_of_range: float = Field(
+        ..., description="Number that defines the end of the range"
+    )
+
+
+class Transition(BaseModel):
+    class Config:
+        extra = Extra.forbid
+
+    id: ID = Field(
         ...,
-        description="The most likely value for the usage rate; the expected increase or decrease of the fill_level per second",
+        description="ID of the Transition. Must be unique in the scope of the OMBC.SystemDescription, FRBC.ActuatorDescription or DDBC.ActuatorDescription in which it is used.",
     )
-    usage_rate_lower_68PPR: Optional[float] = Field(
-        None,
-        description="The lower limit of the range with a 68\xa0% probability that the usage rate is within that range",
+    from_: ID = Field(
+        ...,
+        alias="from",
+        description="ID of the OperationMode (exact type differs per ControlType) that should be switched from.",
     )
-    usage_rate_lower_95PPR: Optional[float] = Field(
-        None,
-        description="The lower limit of the range with a 95\xa0% probability that the usage rate is within that range",
+    to: ID = Field(
+        ...,
+        description="ID of the OperationMode (exact type differs per ControlType) that will be switched to.",
     )
-    usage_rate_lower_limit: Optional[float] = Field(
-        None,
-        description="The lower limit of the range with a 100\xa0% probability that the usage rate is within that range",
+    start_timers: List[ID] = Field(
+        ...,
+        description="List of IDs of Timers that will be (re)started when this transition is initiated",
+        max_items=1000,
+        min_items=0,
     )
-    usage_rate_upper_68PPR: Optional[float] = Field(
-        None,
-        description="The upper limit of the range with a 68\xa0% probability that the usage rate is within that range",
+    blocking_timers: List[ID] = Field(
+        ...,
+        description="List of IDs of Timers that block this Transition from initiating while at least one of these Timers is not yet finished",
+        max_items=1000,
+        min_items=0,
     )
-    usage_rate_upper_95PPR: Optional[float] = Field(
+    transition_costs: Optional[float] = Field(
         None,
-        description="The upper limit of the range with a 95\xa0% probability that the usage rate is within that range. ",
+        description="Absolute costs for going through this Transition in the currency as described in the ResourceManagerDetails.",
     )
-    usage_rate_upper_limit: Optional[float] = Field(
+    transition_duration: Optional[Duration] = Field(
         None,
-        description="The upper limit of the range with a 100\xa0% probability that the usage rate is within that range.",
+        description="Indicates the time between the initiation of this Transition, and the time at which the device behaves according to the Operation Mode which is defined in the ‘to’ data element. When no value is provided it is assumed the transition duration is negligible.",
     )
-
-
-class ID(BaseModel):
-    __root__: constr(regex=r"[a-zA-Z0-9\-_:]{2,64}") = Field(
-        ..., description="An identifier expressed as a UUID"
+    abnormal_condition_only: bool = Field(
+        ...,
+        description="Indicates if this Transition may only be used during an abnormal condition (see Clause )",
     )
 
 
-class InstructionStatus(Enum):
-    NEW = "NEW"
-    ACCEPTED = "ACCEPTED"
-    REJECTED = "REJECTED"
-    REVOKED = "REVOKED"
-    STARTED = "STARTED"
-    SUCCEEDED = "SUCCEEDED"
-    ABORTED = "ABORTED"
-
-
-class InstructionStatusUpdate(BaseModel):
+class Timer(BaseModel):
     class Config:
         extra = Extra.forbid
 
-    instruction_id: ID = Field(
-        ..., description="ID of this instruction (as provided by the CEM) "
+    id: ID = Field(
+        ...,
+        description="ID of the Timer. Must be unique in the scope of the OMBC.SystemDescription, FRBC.ActuatorDescription or DDBC.ActuatorDescription in which it is used.",
     )
-    message_id: ID = Field(..., description="ID of this message")
-    message_type: str = Field("InstructionStatusUpdate", const=True)
-    status_type: InstructionStatus = Field(
-        ..., description="Present status of this instruction."
+    diagnostic_label: Optional[str] = Field(
+        None,
+        description="Human readable name/description of the Timer. This element is only intended for diagnostic purposes and not for HMI applications.",
     )
-    timestamp: datetime = Field(
-        ..., description="Timestamp when status_type has changed the last time."
+    duration: Duration = Field(
+        ...,
+        description="The time it takes for the Timer to finish after it has been started",
     )
 
 
-class NumberRange(BaseModel):
+class PEBCPowerEnvelopeElement(BaseModel):
     class Config:
         extra = Extra.forbid
 
-    end_of_range: float = Field(
-        ..., description="Number that defines the end of the range"
+    duration: Duration = Field(..., description="The duration of the element")
+    upper_limit: float = Field(
+        ...,
+        description="Upper power limit according to the commodity_quantity of the containing PEBC.PowerEnvelope. The lower_limit must be smaller or equal to the upper_limit. The Resource Manager is requested to keep the power values for the given commodity quantity equal to or below the upper_limit. The upper_limit shall be in accordance with the constraints provided by the Resource Manager through any PEBC.AllowedLimitRange with limit_type UPPER_LIMIT.",
     )
-    start_of_range: float = Field(
-        ..., description="Number that defines the start of the range"
+    lower_limit: float = Field(
+        ...,
+        description="Lower power limit according to the commodity_quantity of the containing PEBC.PowerEnvelope. The lower_limit must be smaller or equal to the upper_limit. The Resource Manager is requested to keep the power values for the given commodity quantity equal to or above the lower_limit. The lower_limit shall be in accordance with the constraints provided by the Resource Manager through any PEBC.AllowedLimitRange with limit_type LOWER_LIMIT.",
     )
 
 
-class OMBCInstruction(BaseModel):
+class FRBCStorageDescription(BaseModel):
     class Config:
         extra = Extra.forbid
 
-    abnormal_condition: bool = Field(
+    diagnostic_label: Optional[str] = Field(
+        None,
+        description="Human readable name/description of the storage (e.g. hot water buffer or battery). This element is only intended for diagnostic purposes and not for HMI applications.",
+    )
+    fill_level_label: Optional[str] = Field(
+        None,
+        description="Human readable description of the (physical) units associated with the fill_level (e.g. degrees Celsius or percentage state of charge). This element is only intended for diagnostic purposes and not for HMI applications.",
+    )
+    provides_leakage_behaviour: bool = Field(
         ...,
-        description="Indicates if this is an instruction during an abnormal condition",
+        description="Indicates whether the Storage could provide details of power leakage behaviour through the FRBC.LeakageBehaviour.",
     )
-    execution_time: datetime = Field(
-        ..., description="Time when instruction should be executed."
+    provides_fill_level_target_profile: bool = Field(
+        ...,
+        description="Indicates whether the Storage could provide a target profile for the fill level through the FRBC.FillLevelTargetProfile.",
     )
-    id: ID = Field(
+    provides_usage_forecast: bool = Field(
         ...,
-        description="ID of the instruction. Must be unique in the scope of the Resource Manager, for at least the duration of the session between Resource Manager and CEM.",
+        description="Indicates whether the Storage could provide a UsageForecast through the FRBC.UsageForecast.",
     )
-    message_id: ID = Field(..., description="ID of this message")
-    message_type: str = Field("OMBC.Instruction", const=True)
-    operation_mode_factor: float = Field(
+    fill_level_range: NumberRange = Field(
         ...,
-        description="The number indicates the factor with which the OMBC.OperationMode should be configured. The factor should be greater than or equal than 0 and less or equal to 1.",
+        description="The range in which the fill_level should remain. It is expected of the CEM to keep the fill_level within this range. When the fill_level is not within this range, the Resource Manager can ignore instructions from the CEM (except during abnormal conditions). ",
     )
-    operation_mode_id: ID = Field(
-        ..., description="ID of the OMBC.OperationMode that should be activated"
+
+
+class FRBCLeakageBehaviourElement(BaseModel):
+    class Config:
+        extra = Extra.forbid
+
+    fill_level_range: NumberRange = Field(
+        ...,
+        description="The fill level range for which this FRBC.LeakageBehaviourElement applies. The start of the range must be less than the end of the range.",
+    )
+    leakage_rate: float = Field(
+        ...,
+        description="Indicates how fast the momentary fill level will decrease per second due to leakage within the given range of the fill level. A positive value indicates that the fill level decreases over time due to leakage.",
     )
 
 
-class OMBCStatus(BaseModel):
+class FRBCUsageForecastElement(BaseModel):
     class Config:
         extra = Extra.forbid
 
-    active_operation_mode_id: ID = Field(
-        ..., description="ID of the active OMBC.OperationMode."
+    duration: Duration = Field(
+        ..., description="Indicator for how long the given usage_rate is valid."
     )
-    message_id: ID = Field(..., description="ID of this message")
-    message_type: str = Field("OMBC.Status", const=True)
-    operation_mode_factor: float = Field(
+    usage_rate_upper_limit: Optional[float] = Field(
+        None,
+        description="The upper limit of the range with a 100 % probability that the usage rate is within that range. A positive value indicates that the fill level will decrease due to usage.",
+    )
+    usage_rate_upper_95PPR: Optional[float] = Field(
+        None,
+        description="The upper limit of the range with a 95 % probability that the usage rate is within that range. A positive value indicates that the fill level will decrease due to usage.",
+    )
+    usage_rate_upper_68PPR: Optional[float] = Field(
+        None,
+        description="The upper limit of the range with a 68 % probability that the usage rate is within that range. A positive value indicates that the fill level will decrease due to usage.",
+    )
+    usage_rate_expected: float = Field(
         ...,
-        description="The number indicates the factor with which the OMBC.OperationMode should be configured. The factor should be greater than or equal than 0 and less or equal to 1.",
+        description="The most likely value for the usage rate; the expected increase or decrease of the fill_level per second. A positive value indicates that the fill level will decrease due to usage.",
     )
-    previous_operation_mode_id: Optional[ID] = Field(
+    usage_rate_lower_68PPR: Optional[float] = Field(
         None,
-        description="ID of the OMBC.OperationMode that was previously active. This value shall always be provided, unless the active OMBC.OperationMode is the first OMBC.OperationMode the Resource Manager is aware of.",
+        description="The lower limit of the range with a 68 % probability that the usage rate is within that range. A positive value indicates that the fill level will decrease due to usage.",
     )
-    transition_timestamp: Optional[datetime] = Field(
+    usage_rate_lower_95PPR: Optional[float] = Field(
         None,
-        description="Time at which the transition from the previous OMBC.OperationMode to the active OMBC.OperationMode was initiated. This value shall always be provided, unless the active OMBC.OperationMode is the first OMBC.OperationMode the Resource Manager is aware of.",
+        description="The lower limit of the range with a 95 % probability that the usage rate is within that range. A positive value indicates that the fill level will decrease due to usage.",
+    )
+    usage_rate_lower_limit: Optional[float] = Field(
+        None,
+        description="The lower limit of the range with a 100 % probability that the usage rate is within that range. A positive value indicates that the fill level will decrease due to usage.",
     )
 
 
-class OMBCTimerStatus(BaseModel):
+class FRBCFillLevelTargetProfileElement(BaseModel):
     class Config:
         extra = Extra.forbid
 
-    finished_at: datetime = Field(
+    duration: Duration = Field(..., description="The duration of the element.")
+    fill_level_range: NumberRange = Field(
         ...,
-        description="Indicates when the Timer will be finished. If the DateTimeStamp is in the future, the timer is not yet finished. If the DateTimeStamp is in the past, the timer is finished. If the timer was never started, the value can be an arbitrary DateTimeStamp in the past.",
+        description="The target range in which the fill_level must be for the time period during which the element is active. The start of the range must be smaller or equal to the end of the range. The CEM must take best-effort actions to proactively achieve this target.",
     )
-    message_id: ID = Field(..., description="ID of this message")
-    message_type: str = Field("OMBC.TimerStatus", const=True)
-    timer_id: ID = Field(..., description="The ID of the timer this message refers to")
 
 
-class PEBCEnergyConstraint(BaseModel):
+class DDBCAverageDemandRateForecastElement(BaseModel):
     class Config:
         extra = Extra.forbid
 
-    commodity_quantity: CommodityQuantity = Field(
-        ...,
-        description="Type of power quantity which applies to upper_average_power and lower_average_power",
-    )
-    id: ID = Field(
-        ...,
-        description="Identifier of this PEBC.EnergyConstraints. Must be unique in the scope of the Resource Manager, for at least the duration of the session between Resource Manager and CEM.",
+    duration: Duration = Field(..., description="Duration of the element")
+    demand_rate_upper_limit: Optional[float] = Field(
+        None,
+        description="The upper limit of the range with a 100 % probability that the demand rate is within that range",
     )
-    lower_average_power: float = Field(
-        ...,
-        description="Lower average power within the time period given by valid_from and valid_until. If the duration is multiplied with this power value, then the associated lower energy content can be derived. This is the lowest amount of energy the resource will consume during that period of time.  ",
+    demand_rate_upper_95PPR: Optional[float] = Field(
+        None,
+        description="The upper limit of the range with a 95 % probability that the demand rate is within that range",
     )
-    message_id: ID = Field(..., description="ID of this message")
-    message_type: str = Field("PEBC.EnergyConstraint", const=True)
-    upper_average_power: float = Field(
-        ...,
-        description="Upper average power within the time period given by valid_from and valid_until. If the duration is multiplied with this power value, then the associated upper energy content can be derived. This is the highest amount of energy the resource will consume during that period of time.",
+    demand_rate_upper_68PPR: Optional[float] = Field(
+        None,
+        description="The upper limit of the range with a 68 % probability that the demand rate is within that range",
     )
-    valid_from: datetime = Field(
+    demand_rate_expected: float = Field(
         ...,
-        description="Moment this PEBC.EnergyConstraints information starts to be valid",
+        description="The most likely value for the demand rate; the expected increase or decrease of the fill_level per second",
     )
-    valid_until: datetime = Field(
-        ...,
-        description="Moment until this PEBC.EnergyConstraints information is valid.",
+    demand_rate_lower_68PPR: Optional[float] = Field(
+        None,
+        description="The lower limit of the range with a 68 % probability that the demand rate is within that range",
+    )
+    demand_rate_lower_95PPR: Optional[float] = Field(
+        None,
+        description="The lower limit of the range with a 95 % probability that the demand rate is within that range",
+    )
+    demand_rate_lower_limit: Optional[float] = Field(
+        None,
+        description="The lower limit of the range with a 100 % probability that the demand rate is within that range",
     )
 
 
-class PEBCPowerEnvelopeConsequenceType(Enum):
-    VANISH = "VANISH"
-    DEFER = "DEFER"
+class RoleType(Enum):
+    ENERGY_PRODUCER = "ENERGY_PRODUCER"
+    ENERGY_CONSUMER = "ENERGY_CONSUMER"
+    ENERGY_STORAGE = "ENERGY_STORAGE"
 
 
-class PEBCPowerEnvelopeElement(BaseModel):
-    class Config:
-        extra = Extra.forbid
+class Commodity(Enum):
+    GAS = "GAS"
+    HEAT = "HEAT"
+    ELECTRICITY = "ELECTRICITY"
+    OIL = "OIL"
 
-    duration: Duration = Field(..., description="The duration of the element")
-    lower_limit: float = Field(
-        ...,
-        description="Lower power limit according to the commodity_quantity of the containing PEBC.PowerEnvelope. The lower_limit must be smaller or equal to the upper_limit. The Resource Manager is requested to keep the power values for the given commodity quantity equal to or above the lower_limit. The lower_limit shall be in accordance with the constraints provided by the Resource Manager through any PEBC.AllowedLimitRange with limit_type LOWER_LIMIT.",
-    )
-    upper_limit: float = Field(
-        ...,
-        description="Upper power limit according to the commodity_quantity of the containing PEBC.PowerEnvelope. The lower_limit must be smaller or equal to the upper_limit. The Resource Manager is requested to keep the power values for the given commodity quantity equal to or below the upper_limit. The upper_limit shall be in accordance with the constraints provided by the Resource Manager through any PEBC.AllowedLimitRange with limit_type UPPER_LIMIT.",
-    )
+
+class CommodityQuantity(Enum):
+    ELECTRIC_POWER_L1 = "ELECTRIC.POWER.L1"
+    ELECTRIC_POWER_L2 = "ELECTRIC.POWER.L2"
+    ELECTRIC_POWER_L3 = "ELECTRIC.POWER.L3"
+    ELECTRIC_POWER_3_PHASE_SYMMETRIC = "ELECTRIC.POWER.3_PHASE_SYMMETRIC"
+    NATURAL_GAS_FLOW_RATE = "NATURAL_GAS.FLOW_RATE"
+    HYDROGEN_FLOW_RATE = "HYDROGEN.FLOW_RATE"
+    HEAT_TEMPERATURE = "HEAT.TEMPERATURE"
+    HEAT_FLOW_RATE = "HEAT.FLOW_RATE"
+    HEAT_THERMAL_POWER = "HEAT.THERMAL_POWER"
+    OIL_FLOW_RATE = "OIL.FLOW_RATE"
+
+
+ID = constr(regex=r"[a-zA-Z0-9\-_:]{2,64}")
+
+
+class InstructionStatus(Enum):
+    NEW = "NEW"
+    ACCEPTED = "ACCEPTED"
+    REJECTED = "REJECTED"
+    REVOKED = "REVOKED"
+    STARTED = "STARTED"
+    SUCCEEDED = "SUCCEEDED"
+    ABORTED = "ABORTED"
+
+
+class ControlType(Enum):
+    POWER_ENVELOPE_BASED_CONTROL = "POWER_ENVELOPE_BASED_CONTROL"
+    POWER_PROFILE_BASED_CONTROL = "POWER_PROFILE_BASED_CONTROL"
+    OPERATION_MODE_BASED_CONTROL = "OPERATION_MODE_BASED_CONTROL"
+    FILL_RATE_BASED_CONTROL = "FILL_RATE_BASED_CONTROL"
+    DEMAND_DRIVEN_BASED_CONTROL = "DEMAND_DRIVEN_BASED_CONTROL"
+    NOT_CONTROLABLE = "NOT_CONTROLABLE"
+    NO_SELECTION = "NO_SELECTION"
 
 
 class PEBCPowerEnvelopeLimitType(Enum):
@@ -354,35 +435,9 @@ class PEBCPowerEnvelopeLimitType(Enum):
     LOWER_LIMIT = "LOWER_LIMIT"
 
 
-class PPBCEndInterruptionInstruction(BaseModel):
-    class Config:
-        extra = Extra.forbid
-
-    abnormal_condition: bool = Field(
-        ...,
-        description="Indicates if this is an instruction during an abnormal condition",
-    )
-    execution_time: datetime = Field(
-        ..., description="End time of Interruption of the PPBC.PowerSequence."
-    )
-    id: ID = Field(
-        ...,
-        description="ID of the Instruction. Must be unique in the scope of the Resource Manager, for at least the duration of the session between Resource Manager and CEM.",
-    )
-    message_id: ID = Field(..., description="ID of this message")
-    message_type: str = Field("PPBC.EndInterruptionInstruction", const=True)
-    power_profile_id: ID = Field(
-        ...,
-        description="ID of the PPBC.PowerProfileDefinition of which the PPBC.PowerSequence interruption is being ended by the CEM.",
-    )
-    power_sequence_id: ID = Field(
-        ...,
-        description="ID of the PPBC.PowerSequence for which the CEM wants to end the interruption.",
-    )
-    sequence_container_id: ID = Field(
-        ...,
-        description="ID of the PPBC.PowerSequnceContainer of which the PPBC.PowerSequence interruption is being ended by the CEM.",
-    )
+class PEBCPowerEnvelopeConsequenceType(Enum):
+    VANISH = "VANISH"
+    DEFER = "DEFER"
 
 
 class PPBCPowerSequenceStatus(Enum):
@@ -394,400 +449,338 @@ class PPBCPowerSequenceStatus(Enum):
     ABORTED = "ABORTED"
 
 
-class PPBCScheduleInstruction(BaseModel):
+class OMBCTimerStatus(BaseModel):
     class Config:
         extra = Extra.forbid
 
-    abnormal_condition: bool = Field(
-        ...,
-        description="Indicates if this is an instruction during an abnormal condition",
-    )
-    execution_time: datetime = Field(
-        ..., description="Start time of the PPBC.PowerSequence."
-    )
-    id: ID = Field(
-        ...,
-        description="ID of the Instruction. Must be unique in the scope of the Resource Manager, for at least the duration of the session between Resource Manager and CEM.",
-    )
-    message_id: ID = Field(..., description="ID of this message")
-    message_type: str = Field("PPBC.ScheduleInstruction", const=True)
-    power_profile_id: ID = Field(
-        ...,
-        description="ID of the PPBC.PowerProfileDefinition of which the PPBC.PowerSequence is being selected and scheduled by the CEM.",
-    )
-    power_sequence_id: ID = Field(
-        ...,
-        description="ID of the PPBC.PowerSequence that is being selected and scheduled by the CEM.",
-    )
-    sequence_container_id: ID = Field(
+    message_type: str = Field("OMBC.TimerStatus", const=True)
+    message_id: ID
+    timer_id: ID = Field(..., description="The ID of the timer this message refers to")
+    finished_at: datetime = Field(
         ...,
-        description="ID of the PPBC.PowerSequnceContainer of which the PPBC.PowerSequence is being selected and scheduled by the CEM.",
+        description="Indicates when the Timer will be finished. If the DateTimeStamp is in the future, the timer is not yet finished. If the DateTimeStamp is in the past, the timer is finished. If the timer was never started, the value can be an arbitrary DateTimeStamp in the past.",
     )
 
 
-class PPBCStartInterruptionInstruction(BaseModel):
+class FRBCTimerStatus(BaseModel):
     class Config:
         extra = Extra.forbid
 
-    abnormal_condition: bool = Field(
-        ...,
-        description="Indicates if this is an instruction during an abnormal condition",
-    )
-    execution_time: datetime = Field(
-        ..., description="Start time of the interruption of the PPBC.PowerSequence."
-    )
-    id: ID = Field(
-        ...,
-        description="ID of the Instruction. Must be unique in the scope of the Resource Manager, for at least the duration of the session between Resource Manager and CEM.",
-    )
-    message_id: ID = Field(..., description="ID of this message")
-    message_type: str = Field("PPBC.StartInterruptionInstruction", const=True)
-    power_profile_id: ID = Field(
-        ...,
-        description="ID of the PPBC.PowerProfileDefinition of which the PPBC.PowerSequence is being interrupted by the CEM.",
-    )
-    power_sequence_id: ID = Field(
-        ..., description="ID of the PPBC.PowerSequence that the CEM wants to interrupt."
+    message_type: str = Field("FRBC.TimerStatus", const=True)
+    message_id: ID
+    timer_id: ID = Field(..., description="The ID of the timer this message refers to")
+    actuator_id: ID = Field(
+        ..., description="The ID of the actuator the timer belongs to"
     )
-    sequence_container_id: ID = Field(
+    finished_at: datetime = Field(
         ...,
-        description="ID of the PPBC.PowerSequnceContainer of which the PPBC.PowerSequence is being interrupted by the CEM.",
+        description="Indicates when the Timer will be finished. If the DateTimeStamp is in the future, the timer is not yet finished. If the DateTimeStamp is in the past, the timer is finished. If the timer was never started, the value can be an arbitrary DateTimeStamp in the past.",
     )
 
 
-class PowerForecastValue(BaseModel):
+class DDBCTimerStatus(BaseModel):
     class Config:
         extra = Extra.forbid
 
-    commodity_quantity: CommodityQuantity = Field(
-        ..., description="The power quantity the value refers to"
-    )
-    value_expected: float = Field(..., description="The expected power value.")
-    value_lower_68PPR: Optional[float] = Field(
-        None,
-        description="The lower boundary of the range with 68\xa0% certainty the power value is in it",
-    )
-    value_lower_95PPR: Optional[float] = Field(
-        None,
-        description="The lower boundary of the range with 95\xa0% certainty the power value is in it",
-    )
-    value_lower_limit: Optional[float] = Field(
-        None,
-        description="The lower boundary of the range with 100\xa0% certainty the power value is in it",
-    )
-    value_upper_68PPR: Optional[float] = Field(
-        None,
-        description="The upper boundary of the range with 68\xa0% certainty the power value is in it",
-    )
-    value_upper_95PPR: Optional[float] = Field(
-        None,
-        description="The upper boundary of the range with 95\xa0% certainty the power value is in it",
+    message_type: str = Field("DDBC.TimerStatus", const=True)
+    message_id: ID
+    timer_id: ID = Field(..., description="The ID of the timer this message refers to")
+    actuator_id: ID = Field(
+        ..., description="The ID of the actuator the timer belongs to"
     )
-    value_upper_limit: Optional[float] = Field(
-        None,
-        description="The upper boundary of the range with 100\xa0% certainty the power value is in it",
+    finished_at: datetime = Field(
+        ...,
+        description="Indicates when the Timer will be finished. If the DateTimeStamp is in the future, the timer is not yet finished. If the DateTimeStamp is in the past, the timer is finished. If the timer was never started, the value can be an arbitrary DateTimeStamp in the past.",
     )
 
 
-class PowerRange(BaseModel):
+class SelectControlType(BaseModel):
     class Config:
         extra = Extra.forbid
 
-    commodity_quantity: CommodityQuantity = Field(
-        ..., description="The power quantity the values refer to"
-    )
-    end_of_range: float = Field(
-        ..., description="Power value that defines the end of the range."
-    )
-    start_of_range: float = Field(
-        ..., description="Power value that defines the start of the range."
+    message_type: str = Field("SelectControlType", const=True)
+    message_id: ID
+    control_type: ControlType = Field(
+        ...,
+        description="The ControlType to activate. Must be one of the available ControlTypes as defined in the ResourceManagerDetails",
     )
 
 
-class PowerValue(BaseModel):
+class SessionRequest(BaseModel):
     class Config:
         extra = Extra.forbid
 
-    commodity_quantity: CommodityQuantity = Field(
-        ..., description="The power quantity the value refers to"
-    )
-    value: float = Field(
-        ...,
-        description="Power value expressed in the unit associated with the CommodityQuantity",
+    message_type: str = Field("SessionRequest", const=True)
+    message_id: ID
+    request: SessionRequestType = Field(..., description="The type of request")
+    diagnostic_label: Optional[str] = Field(
+        None,
+        description="Optional field for a human readible descirption for debugging purposes",
     )
 
 
-class ReceptionStatusValues(Enum):
-    INVALID_DATA = "INVALID_DATA"
-    INVALID_MESSAGE = "INVALID_MESSAGE"
-    INVALID_CONTENT = "INVALID_CONTENT"
-    TEMPORARY_ERROR = "TEMPORARY_ERROR"
-    PERMANENT_ERROR = "PERMANENT_ERROR"
-    OK = "OK"
-
-
-class RevokableObjects(Enum):
-    PEBC_PowerConstraints = "PEBC.PowerConstraints"
-    PEBC_EnergyConstraint = "PEBC.EnergyConstraint"
-    PEBC_Instruction = "PEBC.Instruction"
-    PPBC_PowerProfileDefinition = "PPBC.PowerProfileDefinition"
-    PPBC_ScheduleInstruction = "PPBC.ScheduleInstruction"
-    PPBC_StartInterruptionInstruction = "PPBC.StartInterruptionInstruction"
-    PPBC_EndInterruptionInstruction = "PPBC.EndInterruptionInstruction"
-    OMBC_SystemDescription = "OMBC.SystemDescription"
-    OMBC_Instruction = "OMBC.Instruction"
-    FRBC_SystemDescription = "FRBC.SystemDescription"
-    FRBC_Instruction = "FRBC.Instruction"
-    DDBC_SystemDescription = "DDBC.SystemDescription"
-    DDBC_Instruction = "DDBC.Instruction"
-
-
 class RevokeObject(BaseModel):
     class Config:
         extra = Extra.forbid
 
-    message_id: ID = Field(..., description="ID of this message")
     message_type: str = Field("RevokeObject", const=True)
-    object_id: ID = Field(..., description="The ID of object that needs to be revoked")
+    message_id: ID
     object_type: RevokableObjects = Field(
         ..., description="The type of object that needs to be revoked"
     )
+    object_id: ID = Field(..., description="The ID of object that needs to be revoked")
 
 
-class RoleType(Enum):
-    ENERGY_PRODUCER = "ENERGY_PRODUCER"
-    ENERGY_CONSUMER = "ENERGY_CONSUMER"
-    ENERGY_STORAGE = "ENERGY_STORAGE"
-
-
-class SelectControlType(BaseModel):
+class Handshake(BaseModel):
     class Config:
         extra = Extra.forbid
 
-    control_type: ControlType = Field(
-        ...,
-        description="The ControlType to activate. Must be one of the available ControlTypes as defined in the ResourceManagerDetails",
+    message_type: str = Field("Handshake", const=True)
+    message_id: ID
+    role: EnergyManagementRole = Field(
+        ..., description="The role of the sender of this message"
+    )
+    supported_protocol_versions: Optional[List[str]] = Field(
+        None,
+        description="Protocol versions supported by the sender of this message. This field is mandatory for the RM, but optional for the CEM.",
+        min_items=1,
     )
-    message_id: ID = Field(..., description="ID of this message")
-    message_type: str = Field("SelectControlType", const=True)
 
 
-class SessionRequestType(Enum):
-    RECONNECT = "RECONNECT"
-    TERMINATE = "TERMINATE"
+class HandshakeResponse(BaseModel):
+    class Config:
+        extra = Extra.forbid
 
+    message_type: str = Field("HandshakeResponse", const=True)
+    message_id: ID
+    selected_protocol_version: str = Field(
+        ..., description="The protocol version the CEM selected for this session"
+    )
 
-class Timer(BaseModel):
+
+class ReceptionStatus(BaseModel):
     class Config:
         extra = Extra.forbid
 
+    message_type: str = Field("ReceptionStatus", const=True)
+    subject_message_id: ID = Field(
+        ..., description="The message this ReceptionStatus refers to"
+    )
+    status: ReceptionStatusValues = Field(
+        ..., description="Enumeration of status values"
+    )
     diagnostic_label: Optional[str] = Field(
         None,
-        description="Human readable name/description of the Timer. This element is only intended for diagnostic purposes and not for HMI applications.",
+        description="Diagnostic label that can be used to provide additional information for debugging. However, not for HMI purposes.",
     )
-    duration: Duration = Field(
-        ...,
-        description="The time it takes for the Timer to finish after it has been started",
+
+
+class InstructionStatusUpdate(BaseModel):
+    class Config:
+        extra = Extra.forbid
+
+    message_type: str = Field("InstructionStatusUpdate", const=True)
+    message_id: ID
+    instruction_id: ID = Field(
+        ..., description="ID of this instruction (as provided by the CEM) "
     )
-    id: ID = Field(
-        ...,
-        description="ID of the Timer. Must be unique in the scope of the OMBC.SystemDescription, FRBC.ActuatorDescription or DDBC.ActuatorDescription in which it is used.",
+    status_type: InstructionStatus = Field(
+        ..., description="Present status of this instruction."
+    )
+    timestamp: datetime = Field(
+        ..., description="Timestamp when status_type has changed the last time."
     )
 
 
-class Transition(BaseModel):
+class PEBCEnergyConstraint(BaseModel):
     class Config:
         extra = Extra.forbid
 
-    abnormal_condition_only: bool = Field(
+    message_type: str = Field("PEBC.EnergyConstraint", const=True)
+    message_id: ID
+    id: ID = Field(
         ...,
-        description="Indicates if this Transition may only be used during an abnormal condition (see Clause )",
+        description="Identifier of this PEBC.EnergyConstraints. Must be unique in the scope of the Resource Manager, for at least the duration of the session between Resource Manager and CEM.",
     )
-    blocking_timers: List[ID] = Field(
+    valid_from: datetime = Field(
         ...,
-        description="List of IDs of Timers that block this Transition from initiating while at least one of these Timers is not yet finished",
-        max_items=1000,
-        min_items=0,
+        description="Moment this PEBC.EnergyConstraints information starts to be valid",
     )
-    from_: ID = Field(
+    valid_until: datetime = Field(
         ...,
-        alias="from",
-        description="ID of the OperationMode (exact type differs per ControlType) that should be switched from.",
+        description="Moment until this PEBC.EnergyConstraints information is valid.",
     )
-    id: ID = Field(
+    upper_average_power: float = Field(
         ...,
-        description="ID of the Transition. Must be unique in the scope of the OMBC.SystemDescription, FRBC.ActuatorDescription or DDBC.ActuatorDescription in which it is used.",
+        description="Upper average power within the time period given by valid_from and valid_until. If the duration is multiplied with this power value, then the associated upper energy content can be derived. This is the highest amount of energy the resource will consume during that period of time. The Power Envelope created by the CEM must allow at least this much energy consumption (in case the number is positive). Must be greater than or equal to lower_average_power, and can be negative in case of energy production.",
     )
-    start_timers: List[ID] = Field(
+    lower_average_power: float = Field(
         ...,
-        description="List of IDs of Timers that will be (re)started when this transition is initiated",
-        max_items=1000,
-        min_items=0,
+        description="Lower average power within the time period given by valid_from and valid_until. If the duration is multiplied with this power value, then the associated lower energy content can be derived. This is the lowest amount of energy the resource will consume during that period of time. The Power Envelope created by the CEM must allow at least this much energy production (in case the number is negative). Must be greater than or equal to lower_average_power, and can be negative in case of energy production.",
     )
-    to: ID = Field(
+    commodity_quantity: CommodityQuantity = Field(
         ...,
-        description="ID of the OperationMode (exact type differs per ControlType) that will be switched to.",
-    )
-    transition_costs: Optional[float] = Field(
-        None,
-        description="Absolute costs for going through this Transition in the currency as described in the ResourceManagerDetails.",
-    )
-    transition_duration: Optional[Duration] = Field(
-        None,
-        description="Indicates the time between the initiation of this Transition, and the time at which the device behaves according to the Operation Mode which is defined in the ‘to’ data element. When no value is provided it is assumed the transition duration is negligible.",
+        description="Type of power quantity which applies to upper_average_power and lower_average_power",
     )
 
 
-class DDBCActuatorStatus(BaseModel):
+class PPBCScheduleInstruction(BaseModel):
     class Config:
         extra = Extra.forbid
 
-    active_operation_mode_id: ID = Field(
+    message_type: str = Field("PPBC.ScheduleInstruction", const=True)
+    message_id: ID
+    id: ID = Field(
         ...,
-        description="The operation mode that is presently active for this actuator.",
+        description="ID of the Instruction. Must be unique in the scope of the Resource Manager, for at least the duration of the session between Resource Manager and CEM.",
     )
-    actuator_id: ID = Field(
-        ..., description="ID of the actuator this messages refers to"
+    power_profile_id: ID = Field(
+        ...,
+        description="ID of the PPBC.PowerProfileDefinition of which the PPBC.PowerSequence is being selected and scheduled by the CEM.",
     )
-    message_id: ID = Field(..., description="ID of this message")
-    message_type: str = Field("DDBC.ActuatorStatus", const=True)
-    operation_mode_factor: float = Field(
+    sequence_container_id: ID = Field(
         ...,
-        description="The number indicates the factor with which the DDBC.OperationMode is configured. The factor should be greater than or equal to 0 and less or equal to 1.",
+        description="ID of the PPBC.PowerSequnceContainer of which the PPBC.PowerSequence is being selected and scheduled by the CEM.",
     )
-    previous_operation_mode_id: Optional[ID] = Field(
-        None,
-        description="ID of the DDBC,OperationMode that was active before the present one. This value shall always be provided, unless the active DDBC.OperationMode is the first DDBC.OperationMode the Resource Manager is aware of.",
+    power_sequence_id: ID = Field(
+        ...,
+        description="ID of the PPBC.PowerSequence that is being selected and scheduled by the CEM.",
     )
-    transition_timestamp: Optional[datetime] = Field(
-        None,
-        description="Time at which the transition from the previous DDBC.OperationMode to the active DDBC.OperationMode was initiated. This value shall always be provided, unless the active DDBC.OperationMode is the first DDBC.OperationMode the Resource Manager is aware of.",
+    execution_time: datetime = Field(
+        ...,
+        description="Indicates the moment the PPBC.PowerSequence shall start. When the specified execution time is in the past, execution must start as soon as possible.",
+    )
+    abnormal_condition: bool = Field(
+        ...,
+        description="Indicates if this is an instruction during an abnormal condition",
     )
 
 
-class DDBCAverageDemandRateForecastElement(BaseModel):
+class PPBCStartInterruptionInstruction(BaseModel):
     class Config:
         extra = Extra.forbid
 
-    demand_rate_expected: float = Field(
+    message_type: str = Field("PPBC.StartInterruptionInstruction", const=True)
+    message_id: ID
+    id: ID = Field(
         ...,
-        description="The most likely value for the demand rate; the expected increase or decrease of the fill_level per second",
-    )
-    demand_rate_lower_68PPR: Optional[float] = Field(
-        None,
-        description="The lower limit of the range with a 68\xa0% probability that the demand rate is within that range",
+        description="ID of the Instruction. Must be unique in the scope of the Resource Manager, for at least the duration of the session between Resource Manager and CEM.",
     )
-    demand_rate_lower_95PPR: Optional[float] = Field(
-        None,
-        description="The lower limit of the range with a 95\xa0% probability that the demand rate is within that range",
+    power_profile_id: ID = Field(
+        ...,
+        description="ID of the PPBC.PowerProfileDefinition of which the PPBC.PowerSequence is being interrupted by the CEM.",
     )
-    demand_rate_lower_limit: Optional[float] = Field(
-        None,
-        description="The lower limit of the range with a 100\xa0% probability that the demand rate is within that range",
+    sequence_container_id: ID = Field(
+        ...,
+        description="ID of the PPBC.PowerSequnceContainer of which the PPBC.PowerSequence is being interrupted by the CEM.",
     )
-    demand_rate_upper_68PPR: Optional[float] = Field(
-        None,
-        description="The upper limit of the range with a 68\xa0% probability that the demand rate is within that range",
+    power_sequence_id: ID = Field(
+        ..., description="ID of the PPBC.PowerSequence that the CEM wants to interrupt."
     )
-    demand_rate_upper_95PPR: Optional[float] = Field(
-        None,
-        description="The upper limit of the range with a 95\xa0% probability that the demand rate is within that range",
+    execution_time: datetime = Field(
+        ...,
+        description="Indicates the moment the PPBC.PowerSequence shall be interrupted. When the specified execution time is in the past, execution must start as soon as possible.",
     )
-    demand_rate_upper_limit: Optional[float] = Field(
-        None,
-        description="The upper limit of the range with a 100\xa0% probability that the demand rate is within that range",
+    abnormal_condition: bool = Field(
+        ...,
+        description="Indicates if this is an instruction during an abnormal condition",
     )
-    duration: Duration = Field(..., description="Duration of the element")
 
 
-class DDBCInstruction(BaseModel):
+class PPBCEndInterruptionInstruction(BaseModel):
     class Config:
         extra = Extra.forbid
 
-    abnormal_condition: bool = Field(
+    message_type: str = Field("PPBC.EndInterruptionInstruction", const=True)
+    message_id: ID
+    id: ID = Field(
         ...,
-        description="Indicates if this is an instruction during an abnormal condition",
+        description="ID of the Instruction. Must be unique in the scope of the Resource Manager, for at least the duration of the session between Resource Manager and CEM.",
     )
-    actuator_id: ID = Field(
-        ..., description="ID of the actuator this Instruction belongs to."
+    power_profile_id: ID = Field(
+        ...,
+        description="ID of the PPBC.PowerProfileDefinition of which the PPBC.PowerSequence interruption is being ended by the CEM.",
     )
-    execution_time: datetime = Field(
+    sequence_container_id: ID = Field(
         ...,
-        description="Indicates the moment the execution of the instruction shall start",
+        description="ID of the PPBC.PowerSequnceContainer of which the PPBC.PowerSequence interruption is being ended by the CEM.",
     )
-    id: ID = Field(
+    power_sequence_id: ID = Field(
         ...,
-        description="Identifier of this DDBC.Instruction. Must be unique in the scope of the Resource Manager, for at least the duration of the session between Resource Manager and CEM.",
+        description="ID of the PPBC.PowerSequence for which the CEM wants to end the interruption.",
     )
-    message_id: ID = Field(..., description="ID of this message")
-    message_type: str = Field("DDBC.Instruction", const=True)
-    operation_mode_factor: float = Field(
+    execution_time: datetime = Field(
         ...,
-        description="The number indicates the factor with which the OMBC.OperationMode should be configured. The factor should be greater than or equal to 0 and less or equal to 1.",
+        description="Indicates the moment PPBC.PowerSequence interruption shall end. When the specified execution time is in the past, execution must start as soon as possible.",
+    )
+    abnormal_condition: bool = Field(
+        ...,
+        description="Indicates if this is an instruction during an abnormal condition",
     )
-    operation_mode_id: ID = Field(..., description="ID of the DDBC.OperationMode")
 
 
-class DDBCOperationMode(BaseModel):
+class OMBCStatus(BaseModel):
     class Config:
         extra = Extra.forbid
 
-    Id: ID = Field(
-        ...,
-        description="ID of this operation mode. Must be unique in the scope of the DDBC.ActuatorDescription in which it is used.",
+    message_type: str = Field("OMBC.Status", const=True)
+    message_id: ID
+    active_operation_mode_id: ID = Field(
+        ..., description="ID of the active OMBC.OperationMode."
     )
-    abnormal_condition_only: bool = Field(
+    operation_mode_factor: float = Field(
         ...,
-        description="Indicates if this DDBC.OperationMode may only be used during an abnormal condition.",
+        description="The number indicates the factor with which the OMBC.OperationMode should be configured. The factor should be greater than or equal than 0 and less or equal to 1.",
     )
-    diagnostic_label: Optional[str] = Field(
+    previous_operation_mode_id: Optional[ID] = Field(
         None,
-        description="Human readable name/description of the DDBC.OperationMode. This element is only intended for diagnostic purposes and not for HMI applications.",
-    )
-    power_ranges: List[PowerRange] = Field(
-        ...,
-        description="The power produced or consumed by this operation mode. The start of each PowerRange is associated with an operation_mode_factor of 0, the end is associated with an operation_mode_factor of 1. In the array there must be at least one PowerRange, and at most one PowerRange per CommodityQuantity.",
-        max_items=10,
-        min_items=1,
+        description="ID of the OMBC.OperationMode that was previously active. This value shall always be provided, unless the active OMBC.OperationMode is the first OMBC.OperationMode the Resource Manager is aware of.",
     )
-    running_costs: Optional[NumberRange] = Field(
+    transition_timestamp: Optional[datetime] = Field(
         None,
-        description="Additional costs per second (e.g. wear, services) associated with this operation mode in the currency defined by the ResourceManagerDetails, excluding the commodity cost. The range is expressing uncertainty and is not linked to the operation_mode_factor.",
-    )
-    supply_range: NumberRange = Field(
-        ...,
-        description="The supply rate this DDBC.OperationMode can deliver for the CEM to match the demand rate. The start of the NumberRange is associated with an operation_mode_factor of 0, the end is associated with an operation_mode_factor of 1.",
+        description="Time at which the transition from the previous OMBC.OperationMode to the active OMBC.OperationMode was initiated. This value shall always be provided, unless the active OMBC.OperationMode is the first OMBC.OperationMode the Resource Manager is aware of.",
     )
 
 
-class DDBCTimerStatus(BaseModel):
+class OMBCInstruction(BaseModel):
     class Config:
         extra = Extra.forbid
 
-    actuator_id: ID = Field(
-        ..., description="The ID of the actuator the timer belongs to"
+    message_type: str = Field("OMBC.Instruction", const=True)
+    message_id: ID
+    id: ID = Field(
+        ...,
+        description="ID of the instruction. Must be unique in the scope of the Resource Manager, for at least the duration of the session between Resource Manager and CEM.",
     )
-    finished_at: datetime = Field(
+    execution_time: datetime = Field(
         ...,
-        description="Indicates when the Timer will be finished. If the DateTimeStamp is in the future, the timer is not yet finished. If the DateTimeStamp is in the past, the timer is finished. If the timer was never started, the value can be an arbitrary DateTimeStamp in the past.",
+        description="Indicates the moment the execution of the instruction shall start. When the specified execution time is in the past, execution must start as soon as possible.",
+    )
+    operation_mode_id: ID = Field(
+        ..., description="ID of the OMBC.OperationMode that should be activated"
+    )
+    operation_mode_factor: float = Field(
+        ...,
+        description="The number indicates the factor with which the OMBC.OperationMode should be configured. The factor should be greater than or equal than 0 and less or equal to 1.",
+    )
+    abnormal_condition: bool = Field(
+        ...,
+        description="Indicates if this is an instruction during an abnormal condition",
     )
-    message_id: ID = Field(..., description="ID of this message")
-    message_type: str = Field("DDBC.TimerStatus", const=True)
-    timer_id: ID = Field(..., description="The ID of the timer this message refers to")
 
 
 class FRBCActuatorStatus(BaseModel):
     class Config:
         extra = Extra.forbid
 
-    active_operation_mode_id: ID = Field(
-        ..., description="ID of the FRBC.OperationMode that is presently active."
-    )
+    message_type: str = Field("FRBC.ActuatorStatus", const=True)
+    message_id: ID
     actuator_id: ID = Field(
         ..., description="ID of the actuator this messages refers to"
     )
-    message_id: ID = Field(..., description="ID of this message")
-    message_type: str = Field("FRBC.ActuatorStatus", const=True)
+    active_operation_mode_id: ID = Field(
+        ..., description="ID of the FRBC.OperationMode that is presently active."
+    )
     operation_mode_factor: float = Field(
         ...,
         description="The number indicates the factor with which the FRBC.OperationMode is configured. The factor should be greater than or equal than 0 and less or equal to 1.",
@@ -802,14 +795,32 @@ class FRBCActuatorStatus(BaseModel):
     )
 
 
-class FRBCFillLevelTargetProfileElement(BaseModel):
+class FRBCStorageStatus(BaseModel):
     class Config:
         extra = Extra.forbid
 
-    duration: Duration = Field(..., description="The duration of the element.")
-    fill_level_range: NumberRange = Field(
+    message_type: str = Field("FRBC.StorageStatus", const=True)
+    message_id: ID
+    present_fill_level: float = Field(
+        ..., description="Present fill level of the Storage"
+    )
+
+
+class FRBCLeakageBehaviour(BaseModel):
+    class Config:
+        extra = Extra.forbid
+
+    message_type: str = Field("FRBC.LeakageBehaviour", const=True)
+    message_id: ID
+    valid_from: datetime = Field(
         ...,
-        description="The target range in which the fill_level must be for the time period during which the element is active. The start of the range must be smaller or equal to the end of the range. The CEM must take best-effort actions to proactively achieve this target.",
+        description="Moment this FRBC.LeakageBehaviour starts to be valid. If the FRBC.LeakageBehaviour is immediately valid, the DateTimeStamp should be now or in the past.",
+    )
+    elements: List[FRBCLeakageBehaviourElement] = Field(
+        ...,
+        description="List of elements that model the leakage behaviour of the buffer. The fill_level_ranges of the elements must be contiguous.",
+        max_items=288,
+        min_items=1,
     )
 
 
@@ -817,22 +828,15 @@ class FRBCInstruction(BaseModel):
     class Config:
         extra = Extra.forbid
 
-    abnormal_condition: bool = Field(
+    message_type: str = Field("FRBC.Instruction", const=True)
+    message_id: ID
+    id: ID = Field(
         ...,
-        description="Indicates if this is an instruction during an abnormal condition.",
+        description="ID of the instruction. Must be unique in the scope of the Resource Manager, for at least the duration of the session between Resource Manager and CEM.",
     )
     actuator_id: ID = Field(
         ..., description="ID of the actuator this instruction belongs to."
     )
-    execution_time: datetime = Field(
-        ..., description="Time when instruction should be executed."
-    )
-    id: ID = Field(
-        ...,
-        description="ID of the instruction. Must be unique in the scope of the Resource Manager, for at least the duration of the session between Resource Manager and CEM.",
-    )
-    message_id: ID = Field(..., description="ID of this message")
-    message_type: str = Field("FRBC.Instruction", const=True)
     operation_mode: ID = Field(
         ..., description="ID of the FRBC.OperationMode that should be activated."
     )
@@ -840,295 +844,242 @@ class FRBCInstruction(BaseModel):
         ...,
         description="The number indicates the factor with which the FRBC.OperationMode should be configured. The factor should be greater than or equal to 0 and less or equal to 1.",
     )
+    execution_time: datetime = Field(
+        ...,
+        description="Indicates the moment the execution of the instruction shall start. When the specified execution time is in the past, execution must start as soon as possible.",
+    )
+    abnormal_condition: bool = Field(
+        ...,
+        description="Indicates if this is an instruction during an abnormal condition.",
+    )
 
 
-class FRBCLeakageBehaviourElement(BaseModel):
+class FRBCUsageForecast(BaseModel):
     class Config:
         extra = Extra.forbid
 
-    fill_level_range: NumberRange = Field(
-        ...,
-        description="The fill level range for which this FRBC.LeakageBehaviourElement applies. The start of the range must be less than the end of the range.",
+    message_type: str = Field("FRBC.UsageForecast", const=True)
+    message_id: ID
+    start_time: datetime = Field(
+        ..., description="Time at which the FRBC.UsageForecast starts."
     )
-    leakage_rate: float = Field(
+    elements: List[FRBCUsageForecastElement] = Field(
         ...,
-        description="Indicates how fast the momentary fill level will decrease per second due to leakage within the given range of the fill level.",
+        description="Further elements that model the profile. There shall be at least one element. Elements must be placed in chronological order.",
+        max_items=288,
+        min_items=1,
     )
 
 
-class FRBCOperationModeElement(BaseModel):
+class FRBCFillLevelTargetProfile(BaseModel):
     class Config:
         extra = Extra.forbid
 
-    fill_level_range: NumberRange = Field(
-        ...,
-        description="The range of the fill level for which this FRBC.OperationModeElement applies. The start of the NumberRange shall be smaller than the end of the NumberRange.",
-    )
-    fill_rate: NumberRange = Field(
-        ...,
-        description="Indicates the change in fill_level per second. The lower_boundary of the NumberRange is associated with an operation_mode_factor of 0, the upper_boundary is associated with an operation_mode_factor of 1. ",
+    message_type: str = Field("FRBC.FillLevelTargetProfile", const=True)
+    message_id: ID
+    start_time: datetime = Field(
+        ..., description="Time at which the FRBC.FillLevelTargetProfile starts."
     )
-    power_ranges: List[PowerRange] = Field(
+    elements: List[FRBCFillLevelTargetProfileElement] = Field(
         ...,
-        description="The power produced or consumed by this operation mode. The start of each PowerRange is associated with an operation_mode_factor of 0, the end is associated with an operation_mode_factor of 1. In the array there must be at least one PowerRange, and at most one PowerRange per CommodityQuantity.",
-        max_items=10,
+        description="List of different fill levels that have to be targeted within a given duration. There shall be at least one element. Elements must be placed in chronological order.",
+        max_items=288,
         min_items=1,
     )
-    running_costs: Optional[NumberRange] = Field(
-        None,
-        description="Additional costs per second (e.g. wear, services) associated with this operation mode in the currency defined by the ResourceManagerDetails, excluding the commodity cost. The range is expressing uncertainty and is not linked to the operation_mode_factor.",
-    )
 
 
-class FRBCStorageDescription(BaseModel):
+class DDBCActuatorStatus(BaseModel):
     class Config:
         extra = Extra.forbid
 
-    diagnostic_label: Optional[str] = Field(
-        None,
-        description="Human readable name/description of the storage (e.g. hot water buffer or battery). This element is only intended for diagnostic purposes and not for HMI applications.",
-    )
-    fill_level_label: Optional[str] = Field(
-        None,
-        description="Human readable description of the (physical) units associated with the fill_level (e.g. degrees Celsius or percentage state of charge). This element is only intended for diagnostic purposes and not for HMI applications.",
+    message_type: str = Field("DDBC.ActuatorStatus", const=True)
+    message_id: ID
+    actuator_id: ID = Field(
+        ..., description="ID of the actuator this messages refers to"
     )
-    fill_level_range: NumberRange = Field(
+    active_operation_mode_id: ID = Field(
         ...,
-        description="The range in which the fill_level should remain. It is expected of the CEM to keep the fill_level within this range. When the fill_level is not within this range, the Resource Manager can ignore instructions from the CEM (except during abnormal conditions). ",
+        description="The operation mode that is presently active for this actuator.",
     )
-    provides_fill_level_target_profile: bool = Field(
+    operation_mode_factor: float = Field(
         ...,
-        description="Indicates whether the Storage could provide a target profile for the fill level through the FRBC.FillLevelTargetProfile.",
+        description="The number indicates the factor with which the DDBC.OperationMode is configured. The factor should be greater than or equal to 0 and less or equal to 1.",
     )
-    provides_leakage_behaviour: bool = Field(
-        ...,
-        description="Indicates whether the Storage could provide details of power leakage behaviour through the FRBC.LeakageBehaviour.",
+    previous_operation_mode_id: Optional[ID] = Field(
+        None,
+        description="ID of the DDBC,OperationMode that was active before the present one. This value shall always be provided, unless the active DDBC.OperationMode is the first DDBC.OperationMode the Resource Manager is aware of.",
     )
-    provides_usage_forecast: bool = Field(
-        ...,
-        description="Indicates whether the Storage could provide a UsageForecast through the FRBC.UsageForecast.",
+    transition_timestamp: Optional[datetime] = Field(
+        None,
+        description="Time at which the transition from the previous DDBC.OperationMode to the active DDBC.OperationMode was initiated. This value shall always be provided, unless the active DDBC.OperationMode is the first DDBC.OperationMode the Resource Manager is aware of.",
     )
 
 
-class FRBCStorageStatus(BaseModel):
+class DDBCInstruction(BaseModel):
     class Config:
         extra = Extra.forbid
 
-    message_id: ID = Field(..., description="ID of this message")
-    message_type: str = Field("FRBC.StorageStatus", const=True)
-    present_fill_level: float = Field(
-        ..., description="Present fill level of the Storage"
+    message_type: str = Field("DDBC.Instruction", const=True)
+    message_id: ID
+    id: ID = Field(
+        ...,
+        description="Identifier of this DDBC.Instruction. Must be unique in the scope of the Resource Manager, for at least the duration of the session between Resource Manager and CEM.",
+    )
+    execution_time: datetime = Field(
+        ...,
+        description="Indicates the moment the execution of the instruction shall start. When the specified execution time is in the past, execution must start as soon as possible.",
+    )
+    abnormal_condition: bool = Field(
+        ...,
+        description="Indicates if this is an instruction during an abnormal condition",
     )
-
-
-class FRBCTimerStatus(BaseModel):
-    class Config:
-        extra = Extra.forbid
-
     actuator_id: ID = Field(
-        ..., description="The ID of the actuator the timer belongs to"
+        ..., description="ID of the actuator this Instruction belongs to."
     )
-    finished_at: datetime = Field(
+    operation_mode_id: ID = Field(..., description="ID of the DDBC.OperationMode")
+    operation_mode_factor: float = Field(
         ...,
-        description="Indicates when the Timer will be finished. If the DateTimeStamp is in the future, the timer is not yet finished. If the DateTimeStamp is in the past, the timer is finished. If the timer was never started, the value can be an arbitrary DateTimeStamp in the past.",
+        description="The number indicates the factor with which the OMBC.OperationMode should be configured. The factor should be greater than or equal to 0 and less or equal to 1.",
     )
-    message_id: ID = Field(..., description="ID of this message")
-    message_type: str = Field("FRBC.TimerStatus", const=True)
-    timer_id: ID = Field(..., description="The ID of the timer this message refers to")
 
 
-class FRBCUsageForecast(BaseModel):
+class DDBCAverageDemandRateForecast(BaseModel):
     class Config:
         extra = Extra.forbid
 
-    elements: List[FRBCUsageForecastElement] = Field(
+    message_type: str = Field("DDBC.AverageDemandRateForecast", const=True)
+    message_id: ID
+    start_time: datetime = Field(..., description="Start time of the profile.")
+    elements: List[DDBCAverageDemandRateForecastElement] = Field(
         ...,
-        description="Further elements that model the profile. There shall be at least one element. Elements must be placed in chronological order.",
+        description="Elements of the profile. Elements must be placed in chronological order.",
         max_items=288,
         min_items=1,
     )
-    message_id: ID = Field(..., description="ID of this message")
-    message_type: str = Field("FRBC.UsageForecast", const=True)
-    start_time: datetime = Field(
-        ..., description="Time at which the FRBC.UsageForecast starts."
-    )
 
 
-class Handshake(BaseModel):
+class PowerValue(BaseModel):
     class Config:
         extra = Extra.forbid
 
-    message_id: ID = Field(..., description="ID of this message")
-    message_type: str = Field("Handshake", const=True)
-    role: EnergyManagementRole = Field(
-        ..., description="The role of the sender of this message"
+    commodity_quantity: CommodityQuantity = Field(
+        ..., description="The power quantity the value refers to"
     )
-    supported_protocol_versions: Optional[List[str]] = Field(
-        None,
-        description="Protocol versions supported by the sender of this message. This field is mandatory for the RM, but optional for the CEM.",
-        min_items=1,
+    value: float = Field(
+        ...,
+        description="Power value expressed in the unit associated with the CommodityQuantity",
     )
 
 
-class HandshakeResponse(BaseModel):
+class PowerForecastValue(BaseModel):
     class Config:
         extra = Extra.forbid
 
-    message_id: ID = Field(..., description="ID of this message")
-    message_type: str = Field("HandshakeResponse", const=True)
-    selected_protocol_version: str = Field(
-        ..., description="The protocol version the CEM selected for this session"
+    value_upper_limit: Optional[float] = Field(
+        None,
+        description="The upper boundary of the range with 100 % certainty the power value is in it",
     )
-
-
-class OMBCOperationMode(BaseModel):
-    class Config:
-        extra = Extra.forbid
-
-    abnormal_condition_only: bool = Field(
-        ...,
-        description="Indicates if this OMBC.OperationMode may only be used during an abnormal condition.",
+    value_upper_95PPR: Optional[float] = Field(
+        None,
+        description="The upper boundary of the range with 95 % certainty the power value is in it",
     )
-    diagnostic_label: Optional[str] = Field(
+    value_upper_68PPR: Optional[float] = Field(
         None,
-        description="Human readable name/description of the OMBC.OperationMode. This element is only intended for diagnostic purposes and not for HMI applications.",
+        description="The upper boundary of the range with 68 % certainty the power value is in it",
     )
-    id: ID = Field(
-        ...,
-        description="ID of the OBMC.OperationMode. Must be unique in the scope of the Resource Manager, for at least the duration of the session between Resource Manager and CEM.",
+    value_expected: float = Field(..., description="The expected power value.")
+    value_lower_68PPR: Optional[float] = Field(
+        None,
+        description="The lower boundary of the range with 68 % certainty the power value is in it",
     )
-    power_ranges: List[PowerRange] = Field(
-        ...,
-        description="The power produced or consumed by this operation mode. The start of each PowerRange is associated with an operation_mode_factor of 0, the end is associated with an operation_mode_factor of 1. In the array there must be at least one PowerRange, and at most one PowerRange per CommodityQuantity.",
-        max_items=10,
-        min_items=1,
+    value_lower_95PPR: Optional[float] = Field(
+        None,
+        description="The lower boundary of the range with 95 % certainty the power value is in it",
     )
-    running_costs: Optional[NumberRange] = Field(
+    value_lower_limit: Optional[float] = Field(
         None,
-        description="Additional costs per second (e.g. wear, services) associated with this operation mode in the currency defined by the ResourceManagerDetails , excluding the commodity cost. The range is expressing uncertainty and is not linked to the operation_mode_factor.",
+        description="The lower boundary of the range with 100 % certainty the power value is in it",
+    )
+    commodity_quantity: CommodityQuantity = Field(
+        ..., description="The power quantity the value refers to"
     )
 
 
-class OMBCSystemDescription(BaseModel):
+class PowerRange(BaseModel):
     class Config:
         extra = Extra.forbid
 
-    message_id: ID = Field(..., description="ID of this message")
-    message_type: str = Field("OMBC.SystemDescription", const=True)
-    operation_modes: List[OMBCOperationMode] = Field(
-        ...,
-        description="OMBC.OperationModes available for the CEM in order to coordinate the device behaviour.",
-        max_items=100,
-        min_items=1,
-    )
-    timers: List[Timer] = Field(
-        ...,
-        description="Timers that control when certain transitions can be made.",
-        max_items=1000,
-        min_items=0,
+    start_of_range: float = Field(
+        ..., description="Power value that defines the start of the range."
     )
-    transitions: List[Transition] = Field(
-        ...,
-        description="Possible transitions to switch from one OMBC.OperationMode to another.",
-        max_items=1000,
-        min_items=0,
+    end_of_range: float = Field(
+        ..., description="Power value that defines the end of the range."
     )
-    valid_from: datetime = Field(
-        ...,
-        description="Moment this OMBC.SystemDescription starts to be valid. If the system description is immediately valid, the DateTimeStamp should be now or in the past.",
+    commodity_quantity: CommodityQuantity = Field(
+        ..., description="The power quantity the values refer to"
     )
 
 
-class PEBCAllowedLimitRange(BaseModel):
+class Role(BaseModel):
     class Config:
         extra = Extra.forbid
 
-    abnormal_condition_only: bool = Field(
-        ...,
-        description="Indicates if this PEBC.AllowedLimitRange may only be used during an abnormal condition",
-    )
-    commodity_quantity: CommodityQuantity = Field(
-        ..., description="Type of power quantity this PEBC.AllowedLimitRange applies to"
-    )
-    limit_type: PEBCPowerEnvelopeLimitType = Field(
-        ...,
-        description="Indicates if this ranges applies to the upper limit or the lower limit",
-    )
-    range_boundary: NumberRange = Field(
-        ...,
-        description="Boundaries of the power range of this PEBC.AllowedLimitRange. The CEM is allowed to choose values within this range for the power envelope for the limit as described in limit_type. The start of the range shall be smaller or equal than the end of the range. ",
+    role: RoleType = Field(
+        ..., description="Role type of the Resource Manager for the given commodity"
     )
+    commodity: Commodity = Field(..., description="Commodity the role refers to.")
 
 
-class PEBCPowerConstraints(BaseModel):
+class PowerForecastElement(BaseModel):
     class Config:
         extra = Extra.forbid
 
-    allowed_limit_ranges: List[PEBCAllowedLimitRange] = Field(
-        ...,
-        description="The actual constraints. There shall be at least one PEBC.AllowedLimitRange for the UPPER_LIMIT and at least one AllowedLimitRange for the LOWER_LIMIT. It is allowed to have multiple PEBC.AllowedLimitRange objects with identical CommodityQuantities and LimitTypes.",
-        max_items=100,
-        min_items=2,
-    )
-    consequence_type: PEBCPowerEnvelopeConsequenceType = Field(
-        ..., description="Type of consequence of limiting power"
-    )
-    id: ID = Field(
+    duration: Duration = Field(..., description="Duration of the PowerForecastElement")
+    power_values: List[PowerForecastValue] = Field(
         ...,
-        description="Identifier of this PEBC.PowerConstraints. Must be unique in the scope of the Resource Manager, for at least the duration of the session between Resource Manager and CEM.",
-    )
-    message_id: ID = Field(..., description="ID of this message")
-    message_type: str = Field("PEBC.PowerConstraints", const=True)
-    valid_from: datetime = Field(
-        ..., description="Moment this PEBC.PowerConstraints start to be valid"
-    )
-    valid_until: Optional[datetime] = Field(
-        None,
-        description="Moment until this PEBC.PowerConstraints is valid. If valid_until is not present, there is no determined end time of this PEBC.PowerConstraints.",
+        description="The values of power that are expected for the given period of time. There shall be at least one PowerForecastValue, and at most one PowerForecastValue per CommodityQuantity.",
+        max_items=10,
+        min_items=1,
     )
 
 
-class PEBCPowerEnvelope(BaseModel):
+class PEBCAllowedLimitRange(BaseModel):
     class Config:
         extra = Extra.forbid
 
     commodity_quantity: CommodityQuantity = Field(
-        ..., description="Type of power quantity this PEBC.PowerEnvelope applies to"
+        ..., description="Type of power quantity this PEBC.AllowedLimitRange applies to"
     )
-    id: ID = Field(
+    limit_type: PEBCPowerEnvelopeLimitType = Field(
         ...,
-        description="Identifier of this PEBC.PowerEnvelope. Must be unique in the scope of the Resource Manager, for at least the duration of the session between Resource Manager and CEM.",
+        description="Indicates if this ranges applies to the upper limit or the lower limit",
     )
-    power_envelope_elements: List[PEBCPowerEnvelopeElement] = Field(
+    range_boundary: NumberRange = Field(
         ...,
-        description="The elements of this PEBC.PowerEnvelope. Shall contain at least one element. Elements must be placed in chronological order.",
-        max_items=288,
-        min_items=1,
+        description="Boundaries of the power range of this PEBC.AllowedLimitRange. The CEM is allowed to choose values within this range for the power envelope for the limit as described in limit_type. The start of the range shall be smaller or equal than the end of the range. ",
+    )
+    abnormal_condition_only: bool = Field(
+        ...,
+        description="Indicates if this PEBC.AllowedLimitRange may only be used during an abnormal condition",
     )
 
 
-class PPBCPowerSequenceContainerStatus(BaseModel):
+class PEBCPowerEnvelope(BaseModel):
     class Config:
         extra = Extra.forbid
 
-    power_profile_id: ID = Field(
+    id: ID = Field(
         ...,
-        description="ID of the PPBC.PowerProfileDefinition of which the data element ‘sequence_container_id’ refers to. ",
-    )
-    progress: Optional[Duration] = Field(
-        None,
-        description="Time that has passed since the selected sequence has started. A value must be provided, unless no sequence has been selected or the selected sequence hasn’t started yet.",
+        description="Identifier of this PEBC.PowerEnvelope. Must be unique in the scope of the Resource Manager, for at least the duration of the session between Resource Manager and CEM.",
     )
-    selected_sequence_id: Optional[ID] = Field(
-        None,
-        description="ID of selected PPBC.PowerSequence. When no ID is given, no sequence was selected yet.",
+    commodity_quantity: CommodityQuantity = Field(
+        ..., description="Type of power quantity this PEBC.PowerEnvelope applies to"
     )
-    sequence_container_id: ID = Field(
+    power_envelope_elements: List[PEBCPowerEnvelopeElement] = Field(
         ...,
-        description="ID of the PPBC.PowerSequenceContainer this PPBC.PowerSequenceContainerStatus provides information about.",
-    )
-    status: PPBCPowerSequenceStatus = Field(
-        ..., description="Status of the selected PPBC.PowerSequence"
+        description="The elements of this PEBC.PowerEnvelope. Shall contain at least one element. Elements must be placed in chronological order.",
+        max_items=288,
+        min_items=1,
     )
 
 
@@ -1147,210 +1098,229 @@ class PPBCPowerSequenceElement(BaseModel):
     )
 
 
-class PowerForecastElement(BaseModel):
+class PPBCPowerSequenceContainerStatus(BaseModel):
     class Config:
         extra = Extra.forbid
 
-    duration: Duration = Field(..., description="Duration of the PowerForecastElement")
-    power_values: List[PowerForecastValue] = Field(
+    power_profile_id: ID = Field(
         ...,
-        description="The values of power that are expected for the given period of time. There shall be at least one PowerForecastValue, and at most one PowerForecastValue per CommodityQuantity.",
-        max_items=10,
-        min_items=1,
+        description="ID of the PPBC.PowerProfileDefinition of which the data element ‘sequence_container_id’ refers to. ",
+    )
+    sequence_container_id: ID = Field(
+        ...,
+        description="ID of the PPBC.PowerSequenceContainer this PPBC.PowerSequenceContainerStatus provides information about.",
+    )
+    selected_sequence_id: Optional[ID] = Field(
+        None,
+        description="ID of selected PPBC.PowerSequence. When no ID is given, no sequence was selected yet.",
+    )
+    progress: Optional[Duration] = Field(
+        None,
+        description="Time that has passed since the selected sequence has started. A value must be provided, unless no sequence has been selected or the selected sequence hasn’t started yet.",
+    )
+    status: PPBCPowerSequenceStatus = Field(
+        ..., description="Status of the selected PPBC.PowerSequence"
     )
 
 
-class PowerMeasurement(BaseModel):
+class OMBCOperationMode(BaseModel):
     class Config:
         extra = Extra.forbid
 
-    measurement_timestamp: datetime = Field(
-        ..., description="Timestamp when PowerValues were measured."
+    id: ID = Field(
+        ...,
+        description="ID of the OBMC.OperationMode. Must be unique in the scope of the Resource Manager, for at least the duration of the session between Resource Manager and CEM.",
     )
-    message_id: ID = Field(..., description="ID of this message")
-    message_type: str = Field("PowerMeasurement", const=True)
-    values: List[PowerValue] = Field(
+    diagnostic_label: Optional[str] = Field(
+        None,
+        description="Human readable name/description of the OMBC.OperationMode. This element is only intended for diagnostic purposes and not for HMI applications.",
+    )
+    power_ranges: List[PowerRange] = Field(
         ...,
-        description="Array of measured PowerValues. Must contain at least one item and at most one item per ‘commodity_quantity’ (defined inside the PowerValue).",
+        description="The power produced or consumed by this operation mode. The start of each PowerRange is associated with an operation_mode_factor of 0, the end is associated with an operation_mode_factor of 1. In the array there must be at least one PowerRange, and at most one PowerRange per CommodityQuantity.",
         max_items=10,
         min_items=1,
     )
-
-
-class ReceptionStatus(BaseModel):
-    class Config:
-        extra = Extra.forbid
-
-    diagnostic_label: Optional[str] = Field(
+    running_costs: Optional[NumberRange] = Field(
         None,
-        description="Diagnostic label that can be used to provide additional information for debugging. However, not for HMI purposes.",
-    )
-    message_type: str = Field("ReceptionStatus", const=True)
-    status: ReceptionStatusValues = Field(
-        ..., description="Enumeration of status values"
+        description="Additional costs per second (e.g. wear, services) associated with this operation mode in the currency defined by the ResourceManagerDetails , excluding the commodity cost. The range is expressing uncertainty and is not linked to the operation_mode_factor.",
     )
-    subject_message_id: ID = Field(
-        ..., description="The message this ReceptionStatus refers to"
+    abnormal_condition_only: bool = Field(
+        ...,
+        description="Indicates if this OMBC.OperationMode may only be used during an abnormal condition.",
     )
 
 
-class Role(BaseModel):
+class FRBCOperationModeElement(BaseModel):
     class Config:
         extra = Extra.forbid
 
-    commodity: Commodity = Field(..., description="Commodity the role refers to.")
-    role: RoleType = Field(
-        ..., description="Role type of the Resource Manager for the given commodity"
+    fill_level_range: NumberRange = Field(
+        ...,
+        description="The range of the fill level for which this FRBC.OperationModeElement applies. The start of the NumberRange shall be smaller than the end of the NumberRange.",
     )
-
-
-class SessionRequest(BaseModel):
-    class Config:
-        extra = Extra.forbid
-
-    diagnostic_label: Optional[str] = Field(
+    fill_rate: NumberRange = Field(
+        ...,
+        description="Indicates the change in fill_level per second. The lower_boundary of the NumberRange is associated with an operation_mode_factor of 0, the upper_boundary is associated with an operation_mode_factor of 1. ",
+    )
+    power_ranges: List[PowerRange] = Field(
+        ...,
+        description="The power produced or consumed by this operation mode. The start of each PowerRange is associated with an operation_mode_factor of 0, the end is associated with an operation_mode_factor of 1. In the array there must be at least one PowerRange, and at most one PowerRange per CommodityQuantity.",
+        max_items=10,
+        min_items=1,
+    )
+    running_costs: Optional[NumberRange] = Field(
         None,
-        description="Optional field for a human readible descirption for debugging purposes",
+        description="Additional costs per second (e.g. wear, services) associated with this operation mode in the currency defined by the ResourceManagerDetails, excluding the commodity cost. The range is expressing uncertainty and is not linked to the operation_mode_factor.",
     )
-    message_id: ID = Field(..., description="ID of this message")
-    message_type: str = Field("SessionRequest", const=True)
-    request: SessionRequestType = Field(..., description="The type of request")
 
 
-class DDBCActuatorDescription(BaseModel):
+class DDBCOperationMode(BaseModel):
     class Config:
         extra = Extra.forbid
 
+    Id: ID = Field(
+        ...,
+        description="ID of this operation mode. Must be unique in the scope of the DDBC.ActuatorDescription in which it is used.",
+    )
     diagnostic_label: Optional[str] = Field(
         None,
-        description="Human readable name/description of the actuator. This element is only intended for diagnostic purposes and not for HMI applications.",
-    )
-    id: ID = Field(
-        ...,
-        description="ID of this DDBC.ActuatorDescription. Must be unique in the scope of the Resource Manager, for at least the duration of the session between Resource Manager and CEM.",
+        description="Human readable name/description of the DDBC.OperationMode. This element is only intended for diagnostic purposes and not for HMI applications.",
     )
-    operation_modes: List[DDBCOperationMode] = Field(
+    power_ranges: List[PowerRange] = Field(
         ...,
-        description="List of all Operation Modes that are available for this actuator. There shall be at least one DDBC.OperationMode.",
-        max_items=100,
+        description="The power produced or consumed by this operation mode. The start of each PowerRange is associated with an operation_mode_factor of 0, the end is associated with an operation_mode_factor of 1. In the array there must be at least one PowerRange, and at most one PowerRange per CommodityQuantity.",
+        max_items=10,
         min_items=1,
     )
-    supported_commodites: List[Commodity] = Field(
+    supply_range: NumberRange = Field(
         ...,
-        description="Commodities supported by the operation modes of this actuator. There shall be at least one commodity",
-        max_items=4,
-        min_items=1,
+        description="The supply rate this DDBC.OperationMode can deliver for the CEM to match the demand rate. The start of the NumberRange is associated with an operation_mode_factor of 0, the end is associated with an operation_mode_factor of 1.",
     )
-    timers: List[Timer] = Field(
-        ...,
-        description="List of Timers associated with Transitions for this Actuator. Can be empty.",
-        max_items=1000,
-        min_items=0,
+    running_costs: Optional[NumberRange] = Field(
+        None,
+        description="Additional costs per second (e.g. wear, services) associated with this operation mode in the currency defined by the ResourceManagerDetails, excluding the commodity cost. The range is expressing uncertainty and is not linked to the operation_mode_factor.",
     )
-    transitions: List[Transition] = Field(
+    abnormal_condition_only: bool = Field(
         ...,
-        description="List of Transitions between Operation Modes. Shall contain at least one Transition.",
-        max_items=1000,
-        min_items=0,
+        description="Indicates if this DDBC.OperationMode may only be used during an abnormal condition.",
     )
 
 
-class DDBCAverageDemandRateForecast(BaseModel):
+class ResourceManagerDetails(BaseModel):
     class Config:
         extra = Extra.forbid
 
-    elements: List[DDBCAverageDemandRateForecastElement] = Field(
+    message_type: str = Field("ResourceManagerDetails", const=True)
+    message_id: ID
+    resource_id: ID = Field(
         ...,
-        description="Elements of the profile. Elements must be placed in chronological order.",
-        max_items=288,
+        description="Identifier of the Resource Manager. Must be unique within the scope of the CEM.",
+    )
+    name: Optional[str] = Field(None, description="Human readable name given by user")
+    roles: List[Role] = Field(
+        ...,
+        description="Each Resource Manager provides one or more energy Roles",
+        max_items=3,
         min_items=1,
     )
-    message_id: ID = Field(..., description="ID of this message")
-    message_type: str = Field("DDBC.AverageDemandRateForecast", const=True)
-    start_time: datetime = Field(..., description="Start time of the profile.")
-
-
-class DDBCSystemDescription(BaseModel):
-    class Config:
-        extra = Extra.forbid
-
-    actuators: List[DDBCActuatorDescription] = Field(
+    manufacturer: Optional[str] = Field(None, description="Name of Manufacturer")
+    model: Optional[str] = Field(
+        None,
+        description="Name of the model of the device (provided by the manufacturer)",
+    )
+    serial_number: Optional[str] = Field(
+        None, description="Serial number of the device (provided by the manufacturer)"
+    )
+    firmware_version: Optional[str] = Field(
+        None,
+        description="Version identifier of the firmware used in the device (provided by the manufacturer)",
+    )
+    instruction_processing_delay: Duration = Field(
         ...,
-        description="List of all available actuators in the system. Must contain at least one DDBC.ActuatorAggregated.",
-        max_items=10,
+        description="The average time the combination of Resource Manager and HBES/BACS/SASS or (Smart) device needs to process and execute an instruction",
+    )
+    available_control_types: List[ControlType] = Field(
+        ...,
+        description="The control types supported by this Resource Manager.",
+        max_items=5,
         min_items=1,
     )
-    message_id: ID = Field(..., description="ID of this message")
-    message_type: str = Field("DDBC.SystemDescription", const=True)
-    present_demand_rate: NumberRange = Field(
-        ..., description="Present demand rate that needs to be satisfied by the system"
+    currency: Optional[Currency] = Field(
+        None,
+        description="Currency to be used for all information regarding costs. Mandatory if cost information is published.",
     )
-    provides_average_demand_rate_forecast: bool = Field(
+    provides_forecast: bool = Field(
         ...,
-        description="Indicates whether the Resource Manager could provide a demand rate forecast through the DDBC.AverageDemandRateForecast.",
+        description="Indicates whether the ResourceManager is able to provide PowerForecasts",
     )
-    valid_from: datetime = Field(
+    provides_power_measurement_types: List[CommodityQuantity] = Field(
         ...,
-        description="Moment this DDBC.SystemDescription starts to be valid. If the system description is immediately valid, the DateTimeStamp should be now or in the past.",
+        description="Array of all CommodityQuantities that this Resource Manager can provide measurements for. ",
+        max_items=10,
+        min_items=1,
     )
 
 
-class FRBCFillLevelTargetProfile(BaseModel):
+class PowerMeasurement(BaseModel):
     class Config:
         extra = Extra.forbid
 
-    elements: List[FRBCFillLevelTargetProfileElement] = Field(
+    message_type: str = Field("PowerMeasurement", const=True)
+    message_id: ID
+    measurement_timestamp: datetime = Field(
+        ..., description="Timestamp when PowerValues were measured."
+    )
+    values: List[PowerValue] = Field(
         ...,
-        description="List of different fill levels that have to be targeted within a given duration. There shall be at least one element. Elements must be placed in chronological order.",
-        max_items=288,
+        description="Array of measured PowerValues. Must contain at least one item and at most one item per ‘commodity_quantity’ (defined inside the PowerValue).",
+        max_items=10,
         min_items=1,
     )
-    message_id: ID = Field(..., description="ID of this message")
-    message_type: str = Field("FRBC.FillLevelTargetProfile", const=True)
-    start_time: datetime = Field(
-        ..., description="Time at which the FRBC.FillLevelTargetProfile starts."
-    )
 
 
-class FRBCLeakageBehaviour(BaseModel):
+class PowerForecast(BaseModel):
     class Config:
         extra = Extra.forbid
 
-    elements: List[FRBCLeakageBehaviourElement] = Field(
-        ...,
-        description="List of elements that model the leakage behaviour of the buffer. The fill_level_ranges of the elements must be contiguous.",
-        max_items=288,
-        min_items=1,
+    message_type: str = Field("PowerForecast", const=True)
+    message_id: ID
+    start_time: datetime = Field(
+        ..., description="Start time of time period that is covered by the profile."
     )
-    message_id: ID = Field(..., description="ID of this message")
-    message_type: str = Field("FRBC.LeakageBehaviour", const=True)
-    valid_from: datetime = Field(
+    elements: List[PowerForecastElement] = Field(
         ...,
-        description="Moment this FRBC.LeakageBehaviour starts to be valid. If the FRBC.LeakageBehaviour is immediately valid, the DateTimeStamp should be now or in the past.",
+        description="Elements of which this forecast consists. Contains at least one element. Elements must be placed in chronological order.",
+        max_items=288,
+        min_items=1,
     )
 
 
-class FRBCOperationMode(BaseModel):
+class PEBCPowerConstraints(BaseModel):
     class Config:
         extra = Extra.forbid
 
-    abnormal_condition_only: bool = Field(
+    message_type: str = Field("PEBC.PowerConstraints", const=True)
+    message_id: ID
+    id: ID = Field(
         ...,
-        description="Indicates if this FRBC.OperationMode may only be used during an abnormal condition",
+        description="Identifier of this PEBC.PowerConstraints. Must be unique in the scope of the Resource Manager, for at least the duration of the session between Resource Manager and CEM.",
     )
-    diagnostic_label: Optional[str] = Field(
+    valid_from: datetime = Field(
+        ..., description="Moment this PEBC.PowerConstraints start to be valid"
+    )
+    valid_until: Optional[datetime] = Field(
         None,
-        description="Human readable name/description of the FRBC.OperationMode. This element is only intended for diagnostic purposes and not for HMI applications.",
+        description="Moment until this PEBC.PowerConstraints is valid. If valid_until is not present, there is no determined end time of this PEBC.PowerConstraints.",
     )
-    elements: List[FRBCOperationModeElement] = Field(
-        ...,
-        description="List of FRBC.OperationModeElements, which describe the properties of this FRBC.OperationMode depending on the fill_level. The fill_level_ranges of the items in the Array must be contiguous.",
-        max_items=100,
-        min_items=1,
+    consequence_type: PEBCPowerEnvelopeConsequenceType = Field(
+        ..., description="Type of consequence of limiting power"
     )
-    id: ID = Field(
+    allowed_limit_ranges: List[PEBCAllowedLimitRange] = Field(
         ...,
-        description="ID of the FRBC.OperationMode. Must be unique in the scope of the FRBC.ActuatorDescription in which it is used.",
+        description="The actual constraints. There shall be at least one PEBC.AllowedLimitRange for the UPPER_LIMIT and at least one AllowedLimitRange for the LOWER_LIMIT. It is allowed to have multiple PEBC.AllowedLimitRange objects with identical CommodityQuantities and LimitTypes.",
+        max_items=100,
+        min_items=2,
     )
 
 
@@ -1358,20 +1328,20 @@ class PEBCInstruction(BaseModel):
     class Config:
         extra = Extra.forbid
 
-    abnormal_condition: bool = Field(
+    message_type: str = Field("PEBC.Instruction", const=True)
+    message_id: ID
+    id: ID = Field(
         ...,
-        description="Indicates if this is an instruction during an abnormal condition.",
+        description="Identifier of this PEBC.Instruction. Must be unique in the scope of the Resource Manager, for at least the duration of the session between Resource Manager and CEM.",
     )
     execution_time: datetime = Field(
         ...,
-        description="Indicates the moment the execution of the instruction shall start.",
+        description="Indicates the moment the execution of the instruction shall start. When the specified execution time is in the past, execution must start as soon as possible.",
     )
-    id: ID = Field(
+    abnormal_condition: bool = Field(
         ...,
-        description="Identifier of this PEBC.Instruction. Must be unique in the scope of the Resource Manager, for at least the duration of the session between Resource Manager and CEM.",
+        description="Indicates if this is an instruction during an abnormal condition.",
     )
-    message_id: ID = Field(..., description="ID of this message")
-    message_type: str = Field("PEBC.Instruction", const=True)
     power_constraints_id: ID = Field(
         ...,
         description="Identifier of the PEBC.PowerConstraints this PEBC.Instruction was based on.",
@@ -1388,8 +1358,8 @@ class PPBCPowerProfileStatus(BaseModel):
     class Config:
         extra = Extra.forbid
 
-    message_id: ID = Field(..., description="ID of this message")
     message_type: str = Field("PPBC.PowerProfileStatus", const=True)
+    message_id: ID
     sequence_container_status: List[PPBCPowerSequenceContainerStatus] = Field(
         ...,
         description="Array with status information for all PPBC.PowerSequenceContainers in the PPBC.PowerProfileDefinition.",
@@ -1398,119 +1368,164 @@ class PPBCPowerProfileStatus(BaseModel):
     )
 
 
-class PPBCPowerSequence(BaseModel):
+class OMBCSystemDescription(BaseModel):
     class Config:
         extra = Extra.forbid
 
-    abnormal_condition_only: bool = Field(
+    message_type: str = Field("OMBC.SystemDescription", const=True)
+    message_id: ID
+    valid_from: datetime = Field(
         ...,
-        description="Indicates if this PPBC.PowerSequence may only be used during an abnormal condition",
+        description="Moment this OMBC.SystemDescription starts to be valid. If the system description is immediately valid, the DateTimeStamp should be now or in the past.",
     )
-    elements: List[PPBCPowerSequenceElement] = Field(
+    operation_modes: List[OMBCOperationMode] = Field(
         ...,
-        description="List of PPBC.PowerSequenceElements. Shall contain at least one element. Elements must be placed in chronological order.",
-        max_items=288,
+        description="OMBC.OperationModes available for the CEM in order to coordinate the device behaviour.",
+        max_items=100,
         min_items=1,
     )
-    id: ID = Field(
+    transitions: List[Transition] = Field(
         ...,
-        description="ID of the PPBC.PowerSequence. Must be unique in the scope of the PPBC.PowerSequnceContainer in which it is used.",
+        description="Possible transitions to switch from one OMBC.OperationMode to another.",
+        max_items=1000,
+        min_items=0,
     )
-    is_interruptible: bool = Field(
+    timers: List[Timer] = Field(
         ...,
-        description="Indicates whether the option of pausing a sequence is available.",
-    )
-    max_pause_before: Optional[Duration] = Field(
-        None,
-        description="The maximum duration for which a device can be paused between the end of the previous running sequence and the start of this one",
+        description="Timers that control when certain transitions can be made.",
+        max_items=1000,
+        min_items=0,
     )
 
 
-class PPBCPowerSequenceContainer(BaseModel):
+class PPBCPowerSequence(BaseModel):
     class Config:
         extra = Extra.forbid
 
     id: ID = Field(
         ...,
-        description="ID of the PPBC.PowerSequenceContainer. Must be unique in the scope of the PPBC.PowerProfileDefinition in which it is used.",
+        description="ID of the PPBC.PowerSequence. Must be unique in the scope of the PPBC.PowerSequnceContainer in which it is used.",
     )
-    power_sequences: List[PPBCPowerSequence] = Field(
+    elements: List[PPBCPowerSequenceElement] = Field(
         ...,
-        description="List of alternative Sequences where one could be chosen by the CEM",
+        description="List of PPBC.PowerSequenceElements. Shall contain at least one element. Elements must be placed in chronological order.",
         max_items=288,
         min_items=1,
     )
+    is_interruptible: bool = Field(
+        ...,
+        description="Indicates whether the option of pausing a sequence is available.",
+    )
+    max_pause_before: Optional[Duration] = Field(
+        None,
+        description="The maximum duration for which a device can be paused between the end of the previous running sequence and the start of this one",
+    )
+    abnormal_condition_only: bool = Field(
+        ...,
+        description="Indicates if this PPBC.PowerSequence may only be used during an abnormal condition",
+    )
 
 
-class PowerForecast(BaseModel):
+class FRBCOperationMode(BaseModel):
     class Config:
         extra = Extra.forbid
 
-    elements: List[PowerForecastElement] = Field(
+    id: ID = Field(
         ...,
-        description="Elements of which this forecast consists. Contains at least one element. Elements must be placed in chronological order.",
-        max_items=288,
+        description="ID of the FRBC.OperationMode. Must be unique in the scope of the FRBC.ActuatorDescription in which it is used.",
+    )
+    diagnostic_label: Optional[str] = Field(
+        None,
+        description="Human readable name/description of the FRBC.OperationMode. This element is only intended for diagnostic purposes and not for HMI applications.",
+    )
+    elements: List[FRBCOperationModeElement] = Field(
+        ...,
+        description="List of FRBC.OperationModeElements, which describe the properties of this FRBC.OperationMode depending on the fill_level. The fill_level_ranges of the items in the Array must be contiguous.",
+        max_items=100,
         min_items=1,
     )
-    message_id: ID = Field(..., description="ID of this message")
-    message_type: str = Field("PowerForecast", const=True)
-    start_time: datetime = Field(
-        ..., description="Start time of time period that is covered by the profile."
+    abnormal_condition_only: bool = Field(
+        ...,
+        description="Indicates if this FRBC.OperationMode may only be used during an abnormal condition",
     )
 
 
-class ResourceManagerDetails(BaseModel):
+class DDBCActuatorDescription(BaseModel):
     class Config:
         extra = Extra.forbid
 
-    available_control_types: List[ControlType] = Field(
+    id: ID = Field(
         ...,
-        description="The control types supported by this Resource Manager.",
-        max_items=5,
-        min_items=1,
+        description="ID of this DDBC.ActuatorDescription. Must be unique in the scope of the Resource Manager, for at least the duration of the session between Resource Manager and CEM.",
     )
-    currency: Optional[Currency] = Field(
+    diagnostic_label: Optional[str] = Field(
         None,
-        description="Currency to be used for all information regarding costs. Mandatory if cost information is published.",
+        description="Human readable name/description of the actuator. This element is only intended for diagnostic purposes and not for HMI applications.",
     )
-    firmware_version: Optional[str] = Field(
-        None,
-        description="Version identifier of the firmware used in the device (provided by the manufacturer)",
+    supported_commodites: List[Commodity] = Field(
+        ...,
+        description="Commodities supported by the operation modes of this actuator. There shall be at least one commodity",
+        max_items=4,
+        min_items=1,
     )
-    instruction_processing_delay: Duration = Field(
+    operation_modes: List[DDBCOperationMode] = Field(
         ...,
-        description="The average time the combination of Resource Manager and HBES/BACS/SASS or (Smart) device needs to process and execute an instruction",
+        description="List of all Operation Modes that are available for this actuator. There shall be at least one DDBC.OperationMode.",
+        max_items=100,
+        min_items=1,
     )
-    manufacturer: Optional[str] = Field(None, description="Name of Manufacturer")
-    message_id: ID = Field(..., description="ID of this message")
-    message_type: str = Field("ResourceManagerDetails", const=True)
-    model: Optional[str] = Field(
-        None,
-        description="Name of the model of the device (provided by the manufacturer)",
+    transitions: List[Transition] = Field(
+        ...,
+        description="List of Transitions between Operation Modes. Shall contain at least one Transition.",
+        max_items=1000,
+        min_items=0,
     )
-    name: Optional[str] = Field(None, description="Human readable name given by user")
-    provides_forecast: bool = Field(
+    timers: List[Timer] = Field(
         ...,
-        description="Indicates whether the ResourceManager is able to provide PowerForecasts",
+        description="List of Timers associated with Transitions for this Actuator. Can be empty.",
+        max_items=1000,
+        min_items=0,
     )
-    provides_power_measurement_types: List[CommodityQuantity] = Field(
+
+
+class DDBCSystemDescription(BaseModel):
+    class Config:
+        extra = Extra.forbid
+
+    message_type: str = Field("DDBC.SystemDescription", const=True)
+    message_id: ID
+    valid_from: datetime = Field(
         ...,
-        description="Array of all CommodityQuantities that this Resource Manager can provide measurements for. ",
+        description="Moment this DDBC.SystemDescription starts to be valid. If the system description is immediately valid, the DateTimeStamp should be now or in the past.",
+    )
+    actuators: List[DDBCActuatorDescription] = Field(
+        ...,
+        description="List of all available actuators in the system. Must contain at least one DDBC.ActuatorAggregated.",
         max_items=10,
         min_items=1,
     )
-    resource_id: ID = Field(
+    present_demand_rate: NumberRange = Field(
+        ..., description="Present demand rate that needs to be satisfied by the system"
+    )
+    provides_average_demand_rate_forecast: bool = Field(
         ...,
-        description="Identifier of the Resource Manager. Must be unique within the scope of the CEM.",
+        description="Indicates whether the Resource Manager could provide a demand rate forecast through the DDBC.AverageDemandRateForecast.",
     )
-    roles: List[Role] = Field(
+
+
+class PPBCPowerSequenceContainer(BaseModel):
+    class Config:
+        extra = Extra.forbid
+
+    id: ID = Field(
         ...,
-        description="Each Resource Manager provides one or more energy Roles",
-        max_items=3,
-        min_items=1,
+        description="ID of the PPBC.PowerSequenceContainer. Must be unique in the scope of the PPBC.PowerProfileDefinition in which it is used.",
     )
-    serial_number: Optional[str] = Field(
-        None, description="Serial number of the device (provided by the manufacturer)"
+    power_sequences: List[PPBCPowerSequence] = Field(
+        ...,
+        description="List of alternative Sequences where one could be chosen by the CEM",
+        max_items=288,
+        min_items=1,
     )
 
 
@@ -1518,13 +1533,16 @@ class FRBCActuatorDescription(BaseModel):
     class Config:
         extra = Extra.forbid
 
+    id: ID = Field(
+        ...,
+        description="ID of the Actuator. Must be unique in the scope of the Resource Manager, for at least the duration of the session between Resource Manager and CEM.",
+    )
     diagnostic_label: Optional[str] = Field(
         None,
         description="Human readable name/description for the actuator. This element is only intended for diagnostic purposes and not for HMI applications.",
     )
-    id: ID = Field(
-        ...,
-        description="ID of the Actuator. Must be unique in the scope of the Resource Manager, for at least the duration of the session between Resource Manager and CEM.",
+    supported_commodities: List[Commodity] = Field(
+        ..., description="List of all supported Commodities.", max_items=4, min_items=1
     )
     operation_modes: List[FRBCOperationMode] = Field(
         ...,
@@ -1532,60 +1550,57 @@ class FRBCActuatorDescription(BaseModel):
         max_items=100,
         min_items=1,
     )
-    supported_commodities: List[Commodity] = Field(
-        ..., description="List of all supported Commodities.", max_items=4, min_items=1
-    )
-    timers: List[Timer] = Field(
+    transitions: List[Transition] = Field(
         ...,
-        description="List of Timers associated with this actuator",
+        description="Possible transitions between FRBC.OperationModes associated with this actuator.",
         max_items=1000,
         min_items=0,
     )
-    transitions: List[Transition] = Field(
+    timers: List[Timer] = Field(
         ...,
-        description="Possible transitions between FRBC.OperationModes associated with this actuator.",
+        description="List of Timers associated with this actuator",
         max_items=1000,
         min_items=0,
     )
 
 
-class FRBCSystemDescription(BaseModel):
+class PPBCPowerProfileDefinition(BaseModel):
     class Config:
         extra = Extra.forbid
 
-    actuators: List[FRBCActuatorDescription] = Field(
-        ..., description="Details of all Actuators.", max_items=10, min_items=1
+    message_type: str = Field("PPBC.PowerProfileDefinition", const=True)
+    message_id: ID
+    id: ID = Field(
+        ...,
+        description="ID of the PPBC.PowerProfileDefinition. Must be unique in the scope of the Resource Manager, for at least the duration of the session between Resource Manager and CEM.",
     )
-    message_id: ID = Field(..., description="ID of this message")
-    message_type: str = Field("FRBC.SystemDescription", const=True)
-    storage: FRBCStorageDescription = Field(..., description="Details of the storage.")
-    valid_from: datetime = Field(
+    start_time: datetime = Field(
         ...,
-        description="Moment this FRBC.SystemDescription starts to be valid. If the system description is immediately valid, the DateTimeStamp should be now or in the past.",
+        description="Indicates the first possible time the first PPBC.PowerSequence could start",
     )
-
-
-class PPBCPowerProfileDefinition(BaseModel):
-    class Config:
-        extra = Extra.forbid
-
     end_time: datetime = Field(
         ...,
         description="Indicates when the last PPBC.PowerSequence shall be finished at the latest",
     )
-    id: ID = Field(
-        ...,
-        description="ID of the PPBC.PowerProfileDefinition. Must be unique in the scope of the Resource Manager, for at least the duration of the session between Resource Manager and CEM.",
-    )
-    message_id: ID = Field(..., description="ID of this message")
-    message_type: str = Field("PPBC.PowerProfileDefinition", const=True)
     power_sequences_containers: List[PPBCPowerSequenceContainer] = Field(
         ...,
         description="The PPBC.PowerSequenceContainers that make up this PPBC.PowerProfileDefinition. There shall be at least one PPBC.PowerSequenceContainer that includes at least one PPBC.PowerSequence. PPBC.PowerSequenceContainers must be placed in chronological order.",
         max_items=1000,
         min_items=1,
     )
-    start_time: datetime = Field(
+
+
+class FRBCSystemDescription(BaseModel):
+    class Config:
+        extra = Extra.forbid
+
+    message_type: str = Field("FRBC.SystemDescription", const=True)
+    message_id: ID
+    valid_from: datetime = Field(
         ...,
-        description="Indicates the first possible time the first PPBC.PowerSequence could start",
+        description="Moment this FRBC.SystemDescription starts to be valid. If the system description is immediately valid, the DateTimeStamp should be now or in the past.",
     )
+    actuators: List[FRBCActuatorDescription] = Field(
+        ..., description="Details of all Actuators.", max_items=10, min_items=1
+    )
+    storage: FRBCStorageDescription = Field(..., description="Details of the storage.")