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

s2python/generated/gen_s2.py

@@ -1,1591 +1,1611 @@
 # generated by datamodel-codegen:
 #   filename:  openapi.yml
-#   timestamp: 2023-07-31T15:51:31+00:00
+#   timestamp: 2024-07-29T10:18:52+00:00
 
 from __future__ import annotations
 
-from datetime import datetime
 from enum import Enum
 from typing import List, Optional
 
-from pydantic import BaseModel, Extra, Field, conint, constr
+from pydantic import (
+    AwareDatetime,
+    BaseModel,
+    ConfigDict,
+    Field,
+    RootModel,
+    conint,
+    constr,
+)
+from typing_extensions import Literal
 
 
-class Commodity(Enum):
-    GAS = "GAS"
-    HEAT = "HEAT"
-    ELECTRICITY = "ELECTRICITY"
-    OIL = "OIL"
-
-
-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 Duration(RootModel[conint(ge=0)]):
+    root: conint(ge=0) = Field(..., description='Duration in milliseconds')
 
 
-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 ID(RootModel[constr(pattern=r'[a-zA-Z0-9\-_:]{2,64}')]):
+    root: constr(pattern=r'[a-zA-Z0-9\-_:]{2,64}') = Field(..., description='UUID')
 
 
 class Currency(Enum):
-    AED = "AED"
-    ANG = "ANG"
-    AUD = "AUD"
-    CHE = "CHE"
-    CHF = "CHF"
-    CHW = "CHW"
-    EUR = "EUR"
-    GBP = "GBP"
-    LBP = "LBP"
-    LKR = "LKR"
-    LRD = "LRD"
-    LSL = "LSL"
-    LYD = "LYD"
-    MAD = "MAD"
-    MDL = "MDL"
-    MGA = "MGA"
-    MKD = "MKD"
-    MMK = "MMK"
-    MNT = "MNT"
-    MOP = "MOP"
-    MRO = "MRO"
-    MUR = "MUR"
-    MVR = "MVR"
-    MWK = "MWK"
-    MXN = "MXN"
-    MXV = "MXV"
-    MYR = "MYR"
-    MZN = "MZN"
-    NAD = "NAD"
-    NGN = "NGN"
-    NIO = "NIO"
-    NOK = "NOK"
-    NPR = "NPR"
-    NZD = "NZD"
-    OMR = "OMR"
-    PAB = "PAB"
-    PEN = "PEN"
-    PGK = "PGK"
-    PHP = "PHP"
-    PKR = "PKR"
-    PLN = "PLN"
-    PYG = "PYG"
-    QAR = "QAR"
-    RON = "RON"
-    RSD = "RSD"
-    RUB = "RUB"
-    RWF = "RWF"
-    SAR = "SAR"
-    SBD = "SBD"
-    SCR = "SCR"
-    SDG = "SDG"
-    SEK = "SEK"
-    SGD = "SGD"
-    SHP = "SHP"
-    SLL = "SLL"
-    SOS = "SOS"
-    SRD = "SRD"
-    SSP = "SSP"
-    STD = "STD"
-    SYP = "SYP"
-    SZL = "SZL"
-    THB = "THB"
-    TJS = "TJS"
-    TMT = "TMT"
-    TND = "TND"
-    TOP = "TOP"
-    TRY = "TRY"
-    TTD = "TTD"
-    TWD = "TWD"
-    TZS = "TZS"
-    UAH = "UAH"
-    UGX = "UGX"
-    USD = "USD"
-    USN = "USN"
-    UYI = "UYI"
-    UYU = "UYU"
-    UZS = "UZS"
-    VEF = "VEF"
-    VND = "VND"
-    VUV = "VUV"
-    WST = "WST"
-    XAG = "XAG"
-    XAU = "XAU"
-    XBA = "XBA"
-    XBB = "XBB"
-    XBC = "XBC"
-    XBD = "XBD"
-    XCD = "XCD"
-    XOF = "XOF"
-    XPD = "XPD"
-    XPF = "XPF"
-    XPT = "XPT"
-    XSU = "XSU"
-    XTS = "XTS"
-    XUA = "XUA"
-    XXX = "XXX"
-    YER = "YER"
-    ZAR = "ZAR"
-    ZMW = "ZMW"
-    ZWL = "ZWL"
-
-
-class Duration(BaseModel):
-    __root__: conint(ge=0) = Field(..., description="Duration in milliseconds")
-
-
-class EnergyManagementRole(Enum):
-    CEM = "CEM"
-    RM = "RM"
-
-
-class FRBCUsageForecastElement(BaseModel):
-    class Config:
-        extra = Extra.forbid
+    AED = 'AED'
+    ANG = 'ANG'
+    AUD = 'AUD'
+    CHE = 'CHE'
+    CHF = 'CHF'
+    CHW = 'CHW'
+    EUR = 'EUR'
+    GBP = 'GBP'
+    LBP = 'LBP'
+    LKR = 'LKR'
+    LRD = 'LRD'
+    LSL = 'LSL'
+    LYD = 'LYD'
+    MAD = 'MAD'
+    MDL = 'MDL'
+    MGA = 'MGA'
+    MKD = 'MKD'
+    MMK = 'MMK'
+    MNT = 'MNT'
+    MOP = 'MOP'
+    MRO = 'MRO'
+    MUR = 'MUR'
+    MVR = 'MVR'
+    MWK = 'MWK'
+    MXN = 'MXN'
+    MXV = 'MXV'
+    MYR = 'MYR'
+    MZN = 'MZN'
+    NAD = 'NAD'
+    NGN = 'NGN'
+    NIO = 'NIO'
+    NOK = 'NOK'
+    NPR = 'NPR'
+    NZD = 'NZD'
+    OMR = 'OMR'
+    PAB = 'PAB'
+    PEN = 'PEN'
+    PGK = 'PGK'
+    PHP = 'PHP'
+    PKR = 'PKR'
+    PLN = 'PLN'
+    PYG = 'PYG'
+    QAR = 'QAR'
+    RON = 'RON'
+    RSD = 'RSD'
+    RUB = 'RUB'
+    RWF = 'RWF'
+    SAR = 'SAR'
+    SBD = 'SBD'
+    SCR = 'SCR'
+    SDG = 'SDG'
+    SEK = 'SEK'
+    SGD = 'SGD'
+    SHP = 'SHP'
+    SLL = 'SLL'
+    SOS = 'SOS'
+    SRD = 'SRD'
+    SSP = 'SSP'
+    STD = 'STD'
+    SYP = 'SYP'
+    SZL = 'SZL'
+    THB = 'THB'
+    TJS = 'TJS'
+    TMT = 'TMT'
+    TND = 'TND'
+    TOP = 'TOP'
+    TRY = 'TRY'
+    TTD = 'TTD'
+    TWD = 'TWD'
+    TZS = 'TZS'
+    UAH = 'UAH'
+    UGX = 'UGX'
+    USD = 'USD'
+    USN = 'USN'
+    UYI = 'UYI'
+    UYU = 'UYU'
+    UZS = 'UZS'
+    VEF = 'VEF'
+    VND = 'VND'
+    VUV = 'VUV'
+    WST = 'WST'
+    XAG = 'XAG'
+    XAU = 'XAU'
+    XBA = 'XBA'
+    XBB = 'XBB'
+    XBC = 'XBC'
+    XBD = 'XBD'
+    XCD = 'XCD'
+    XOF = 'XOF'
+    XPD = 'XPD'
+    XPF = 'XPF'
+    XPT = 'XPT'
+    XSU = 'XSU'
+    XTS = 'XTS'
+    XUA = 'XUA'
+    XXX = 'XXX'
+    YER = 'YER'
+    ZAR = 'ZAR'
+    ZMW = 'ZMW'
+    ZWL = 'ZWL'
 
-    duration: Duration = Field(
-        ..., description="Indicator for how long the given usage_rate is valid."
-    )
-    usage_rate_expected: float = Field(
-        ...,
-        description="The most likely value for the usage rate; the expected increase or decrease of the fill_level per second",
-    )
-    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",
-    )
-    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",
-    )
-    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",
-    )
-    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",
-    )
-    usage_rate_upper_95PPR: Optional[float] = Field(
-        None,
-        description="The upper limit of the range with a 95\xa0% probability that the usage rate is within that range. ",
-    )
-    usage_rate_upper_limit: Optional[float] = Field(
-        None,
-        description="The upper limit of the range with a 100\xa0% probability that the usage rate is within that range.",
-    )
 
+class SessionRequestType(Enum):
+    RECONNECT = 'RECONNECT'
+    TERMINATE = 'TERMINATE'
 
-class ID(BaseModel):
-    __root__: constr(regex=r"[a-zA-Z0-9\-_:]{2,64}") = Field(
-        ..., description="An identifier expressed as a UUID"
-    )
 
+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 InstructionStatus(Enum):
-    NEW = "NEW"
-    ACCEPTED = "ACCEPTED"
-    REJECTED = "REJECTED"
-    REVOKED = "REVOKED"
-    STARTED = "STARTED"
-    SUCCEEDED = "SUCCEEDED"
-    ABORTED = "ABORTED"
 
+class EnergyManagementRole(Enum):
+    CEM = 'CEM'
+    RM = 'RM'
 
-class InstructionStatusUpdate(BaseModel):
-    class Config:
-        extra = Extra.forbid
 
-    instruction_id: ID = Field(
-        ..., description="ID of this instruction (as provided by the CEM) "
-    )
-    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."
-    )
-    timestamp: datetime = Field(
-        ..., description="Timestamp when status_type has changed the last time."
-    )
+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
-
-    end_of_range: float = Field(
-        ..., description="Number that defines the end of the range"
+    model_config = ConfigDict(
+        extra='forbid',
     )
     start_of_range: float = Field(
-        ..., description="Number that defines the start of the range"
+        ..., description='Number that defines the start of the range'
+    )
+    end_of_range: float = Field(
+        ..., description='Number that defines the end of the range'
     )
 
 
-class OMBCInstruction(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="Time when instruction should be executed."
+class Transition(BaseModel):
+    model_config = ConfigDict(
+        extra='forbid',
     )
     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.",
+        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.',
     )
-    message_id: ID = Field(..., description="ID of this message")
-    message_type: str = Field("OMBC.Instruction", const=True)
-    operation_mode_factor: float = Field(
+    from_: ID = 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.",
+        alias='from',
+        description='ID of the OperationMode (exact type differs per ControlType) that should be switched from.',
     )
-    operation_mode_id: ID = Field(
-        ..., description="ID of the OMBC.OperationMode that should be activated"
+    to: ID = Field(
+        ...,
+        description='ID of the OperationMode (exact type differs per ControlType) that will be switched to.',
     )
-
-
-class OMBCStatus(BaseModel):
-    class Config:
-        extra = Extra.forbid
-
-    active_operation_mode_id: ID = Field(
-        ..., description="ID of the active OMBC.OperationMode."
+    start_timers: List[ID] = Field(
+        ...,
+        description='List of IDs of Timers that will be (re)started when this transition is initiated',
+        max_length=1000,
+        min_length=0,
     )
-    message_id: ID = Field(..., description="ID of this message")
-    message_type: str = Field("OMBC.Status", const=True)
-    operation_mode_factor: float = Field(
+    blocking_timers: List[ID] = 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='List of IDs of Timers that block this Transition from initiating while at least one of these Timers is not yet finished',
+        max_length=1000,
+        min_length=0,
     )
-    previous_operation_mode_id: Optional[ID] = Field(
+    transition_costs: 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='Absolute costs for going through this Transition in the currency as described in the ResourceManagerDetails.',
     )
-    transition_timestamp: Optional[datetime] = Field(
+    transition_duration: Optional[Duration] = 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='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 OMBCTimerStatus(BaseModel):
-    class Config:
-        extra = Extra.forbid
-
-    finished_at: datetime = Field(
+    abnormal_condition_only: bool = 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 if this Transition may only be used during an abnormal condition (see Clause )',
     )
-    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 Config:
-        extra = Extra.forbid
 
-    commodity_quantity: CommodityQuantity = Field(
-        ...,
-        description="Type of power quantity which applies to upper_average_power and lower_average_power",
+class Timer(BaseModel):
+    model_config = ConfigDict(
+        extra='forbid',
     )
     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.",
+        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.',
     )
-    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.  ",
-    )
-    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.",
-    )
-    valid_from: datetime = Field(
-        ...,
-        description="Moment this PEBC.EnergyConstraints information starts to be valid",
+    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.',
     )
-    valid_until: datetime = Field(
+    duration: Duration = Field(
         ...,
-        description="Moment until this PEBC.EnergyConstraints information is valid.",
+        description='The time it takes for the Timer to finish after it has been started',
     )
 
 
-class PEBCPowerEnvelopeConsequenceType(Enum):
-    VANISH = "VANISH"
-    DEFER = "DEFER"
-
-
 class PEBCPowerEnvelopeElement(BaseModel):
-    class Config:
-        extra = Extra.forbid
-
-    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.",
+    model_config = ConfigDict(
+        extra='forbid',
     )
+    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.",
+        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.',
+    )
+    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 PEBCPowerEnvelopeLimitType(Enum):
-    UPPER_LIMIT = "UPPER_LIMIT"
-    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",
+class FRBCStorageDescription(BaseModel):
+    model_config = ConfigDict(
+        extra='forbid',
     )
-    execution_time: datetime = Field(
-        ..., description="End time of Interruption of the PPBC.PowerSequence."
+    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.',
     )
-    id: ID = Field(
+    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="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 details of power leakage behaviour through the FRBC.LeakageBehaviour.',
     )
-    message_id: ID = Field(..., description="ID of this message")
-    message_type: str = Field("PPBC.EndInterruptionInstruction", const=True)
-    power_profile_id: ID = Field(
+    provides_fill_level_target_profile: bool = Field(
         ...,
-        description="ID of the PPBC.PowerProfileDefinition of which the PPBC.PowerSequence interruption is being ended by the CEM.",
+        description='Indicates whether the Storage could provide a target profile for the fill level through the FRBC.FillLevelTargetProfile.',
     )
-    power_sequence_id: ID = Field(
+    provides_usage_forecast: bool = Field(
         ...,
-        description="ID of the PPBC.PowerSequence for which the CEM wants to end the interruption.",
+        description='Indicates whether the Storage could provide a UsageForecast through the FRBC.UsageForecast.',
     )
-    sequence_container_id: ID = Field(
+    fill_level_range: NumberRange = Field(
         ...,
-        description="ID of the PPBC.PowerSequnceContainer of which the PPBC.PowerSequence interruption is being ended by the CEM.",
+        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). ',
     )
 
 
-class PPBCPowerSequenceStatus(Enum):
-    NOT_SCHEDULED = "NOT_SCHEDULED"
-    SCHEDULED = "SCHEDULED"
-    EXECUTING = "EXECUTING"
-    INTERRUPTED = "INTERRUPTED"
-    FINISHED = "FINISHED"
-    ABORTED = "ABORTED"
-
-
-class PPBCScheduleInstruction(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.",
+class FRBCLeakageBehaviourElement(BaseModel):
+    model_config = ConfigDict(
+        extra='forbid',
     )
-    power_sequence_id: ID = Field(
+    fill_level_range: NumberRange = Field(
         ...,
-        description="ID of the PPBC.PowerSequence that is being selected and scheduled by the CEM.",
+        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.',
     )
-    sequence_container_id: ID = Field(
+    leakage_rate: float = Field(
         ...,
-        description="ID of the PPBC.PowerSequnceContainer of which the PPBC.PowerSequence is being selected and scheduled by the CEM.",
+        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 PPBCStartInterruptionInstruction(BaseModel):
-    class Config:
-        extra = Extra.forbid
-
-    abnormal_condition: bool = Field(
-        ...,
-        description="Indicates if this is an instruction during an abnormal condition",
+class FRBCUsageForecastElement(BaseModel):
+    model_config = ConfigDict(
+        extra='forbid',
     )
-    execution_time: datetime = Field(
-        ..., description="Start time of the interruption of the PPBC.PowerSequence."
+    duration: Duration = Field(
+        ..., description='Indicator for how long the given usage_rate is valid.'
     )
-    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.",
+    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.',
     )
-    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.",
+    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.',
     )
-    power_sequence_id: ID = Field(
-        ..., description="ID of the PPBC.PowerSequence that the CEM wants to interrupt."
+    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.',
     )
-    sequence_container_id: ID = Field(
+    usage_rate_expected: float = Field(
         ...,
-        description="ID of the PPBC.PowerSequnceContainer of which the PPBC.PowerSequence is being interrupted by the CEM.",
+        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.',
+    )
+    usage_rate_lower_68PPR: Optional[float] = Field(
+        None,
+        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.',
+    )
+    usage_rate_lower_95PPR: Optional[float] = Field(
+        None,
+        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 PowerForecastValue(BaseModel):
-    class Config:
-        extra = Extra.forbid
+class FRBCFillLevelTargetProfileElement(BaseModel):
+    model_config = ConfigDict(
+        extra='forbid',
+    )
+    duration: Duration = Field(..., description='The duration of the element.')
+    fill_level_range: NumberRange = 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.',
+    )
 
-    commodity_quantity: CommodityQuantity = Field(
-        ..., description="The power quantity the value refers to"
+
+class DDBCAverageDemandRateForecastElement(BaseModel):
+    model_config = ConfigDict(
+        extra='forbid',
     )
-    value_expected: float = Field(..., description="The expected power value.")
-    value_lower_68PPR: Optional[float] = Field(
+    duration: Duration = Field(..., description='Duration of the element')
+    demand_rate_upper_limit: Optional[float] = Field(
         None,
-        description="The lower boundary of the range with 68\xa0% certainty the power value is in it",
+        description='The upper limit of the range with a 100 % probability that the demand rate is within that range',
     )
-    value_lower_95PPR: Optional[float] = Field(
+    demand_rate_upper_95PPR: Optional[float] = Field(
         None,
-        description="The lower boundary of the range with 95\xa0% certainty the power value is in it",
+        description='The upper limit of the range with a 95 % probability that the demand rate is within that range',
     )
-    value_lower_limit: Optional[float] = Field(
+    demand_rate_upper_68PPR: Optional[float] = Field(
         None,
-        description="The lower boundary of the range with 100\xa0% certainty the power value is in it",
+        description='The upper limit of the range with a 68 % probability that the demand rate is within that range',
     )
-    value_upper_68PPR: Optional[float] = Field(
+    demand_rate_expected: float = 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 upper boundary of the range with 68\xa0% certainty the power value is in it",
+        description='The lower limit of the range with a 68 % probability that the demand rate is within that range',
     )
-    value_upper_95PPR: Optional[float] = Field(
+    demand_rate_lower_95PPR: Optional[float] = Field(
         None,
-        description="The upper boundary of the range with 95\xa0% certainty the power value is in it",
+        description='The lower limit of the range with a 95 % probability that the demand rate is within that range',
     )
-    value_upper_limit: Optional[float] = Field(
+    demand_rate_lower_limit: Optional[float] = Field(
         None,
-        description="The upper boundary of the range with 100\xa0% certainty the power value is in it",
+        description='The lower limit of the range with a 100 % probability that the demand rate is within that range',
     )
 
 
-class PowerRange(BaseModel):
-    class Config:
-        extra = Extra.forbid
+class RoleType(Enum):
+    ENERGY_PRODUCER = 'ENERGY_PRODUCER'
+    ENERGY_CONSUMER = 'ENERGY_CONSUMER'
+    ENERGY_STORAGE = 'ENERGY_STORAGE'
 
-    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."
+
+class Commodity(Enum):
+    GAS = 'GAS'
+    HEAT = 'HEAT'
+    ELECTRICITY = 'ELECTRICITY'
+    OIL = 'OIL'
+
+
+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 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):
+    UPPER_LIMIT = 'UPPER_LIMIT'
+    LOWER_LIMIT = 'LOWER_LIMIT'
+
+
+class PEBCPowerEnvelopeConsequenceType(Enum):
+    VANISH = 'VANISH'
+    DEFER = 'DEFER'
+
+
+class PPBCPowerSequenceStatus(Enum):
+    NOT_SCHEDULED = 'NOT_SCHEDULED'
+    SCHEDULED = 'SCHEDULED'
+    EXECUTING = 'EXECUTING'
+    INTERRUPTED = 'INTERRUPTED'
+    FINISHED = 'FINISHED'
+    ABORTED = 'ABORTED'
+
+
+class OMBCTimerStatus(BaseModel):
+    model_config = ConfigDict(
+        extra='forbid',
     )
-    start_of_range: float = Field(
-        ..., description="Power value that defines the start of the range."
+    message_type: Literal['OMBC.TimerStatus'] = 'OMBC.TimerStatus'
+    message_id: ID
+    timer_id: ID = Field(..., description='The ID of the timer this message refers to')
+    finished_at: AwareDatetime = 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 PowerValue(BaseModel):
-    class Config:
-        extra = Extra.forbid
+class FRBCTimerStatus(BaseModel):
+    model_config = ConfigDict(
+        extra='forbid',
+    )
+    message_type: Literal['FRBC.TimerStatus'] = 'FRBC.TimerStatus'
+    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'
+    )
+    finished_at: AwareDatetime = 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.',
+    )
 
-    commodity_quantity: CommodityQuantity = Field(
-        ..., description="The power quantity the value refers to"
+
+class DDBCTimerStatus(BaseModel):
+    model_config = ConfigDict(
+        extra='forbid',
     )
-    value: float = Field(
+    message_type: Literal['DDBC.TimerStatus'] = 'DDBC.TimerStatus'
+    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'
+    )
+    finished_at: AwareDatetime = Field(
         ...,
-        description="Power value expressed in the unit associated with the CommodityQuantity",
+        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 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 SelectControlType(BaseModel):
+    model_config = ConfigDict(
+        extra='forbid',
+    )
+    message_type: Literal['SelectControlType'] = 'SelectControlType'
+    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 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 SessionRequest(BaseModel):
+    model_config = ConfigDict(
+        extra='forbid',
+    )
+    message_type: Literal['SessionRequest'] = 'SessionRequest'
+    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 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")
+    model_config = ConfigDict(
+        extra='forbid',
+    )
+    message_type: Literal['RevokeObject'] = 'RevokeObject'
+    message_id: ID
     object_type: RevokableObjects = Field(
-        ..., description="The type of object that needs to be revoked"
+        ..., 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 Handshake(BaseModel):
+    model_config = ConfigDict(
+        extra='forbid',
+    )
+    message_type: Literal['Handshake'] = 'Handshake'
+    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_length=1,
+    )
 
-class SelectControlType(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",
+class HandshakeResponse(BaseModel):
+    model_config = ConfigDict(
+        extra='forbid',
+    )
+    message_type: Literal['HandshakeResponse'] = 'HandshakeResponse'
+    message_id: ID
+    selected_protocol_version: str = Field(
+        ..., description='The protocol version the CEM selected for this session'
     )
-    message_id: ID = Field(..., description="ID of this message")
-    message_type: str = Field("SelectControlType", const=True)
 
 
-class SessionRequestType(Enum):
-    RECONNECT = "RECONNECT"
-    TERMINATE = "TERMINATE"
+class ReceptionStatus(BaseModel):
+    model_config = ConfigDict(
+        extra='forbid',
+    )
+    message_type: Literal['ReceptionStatus'] = 'ReceptionStatus'
+    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='Diagnostic label that can be used to provide additional information for debugging. However, not for HMI purposes.',
+    )
 
 
-class Timer(BaseModel):
-    class Config:
-        extra = Extra.forbid
+class InstructionStatusUpdate(BaseModel):
+    model_config = ConfigDict(
+        extra='forbid',
+    )
+    message_type: Literal['InstructionStatusUpdate'] = 'InstructionStatusUpdate'
+    message_id: ID
+    instruction_id: ID = Field(
+        ..., description='ID of this instruction (as provided by the CEM) '
+    )
+    status_type: InstructionStatus = Field(
+        ..., description='Present status of this instruction.'
+    )
+    timestamp: AwareDatetime = Field(
+        ..., description='Timestamp when status_type has changed the last time.'
+    )
 
-    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.",
+
+class PEBCEnergyConstraint(BaseModel):
+    model_config = ConfigDict(
+        extra='forbid',
     )
-    duration: Duration = Field(
+    message_type: Literal['PEBC.EnergyConstraint'] = 'PEBC.EnergyConstraint'
+    message_id: ID
+    id: ID = Field(
         ...,
-        description="The time it takes for the Timer to finish after it has been started",
+        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.',
     )
-    id: ID = Field(
+    valid_from: AwareDatetime = Field(
+        ...,
+        description='Moment this PEBC.EnergyConstraints information starts to be valid',
+    )
+    valid_until: AwareDatetime = Field(
+        ...,
+        description='Moment until this PEBC.EnergyConstraints information is valid.',
+    )
+    upper_average_power: float = 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.",
+        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.',
+    )
+    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. 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.',
+    )
+    commodity_quantity: CommodityQuantity = Field(
+        ...,
+        description='Type of power quantity which applies to upper_average_power and lower_average_power',
     )
 
 
-class Transition(BaseModel):
-    class Config:
-        extra = Extra.forbid
+class PPBCScheduleInstruction(BaseModel):
+    model_config = ConfigDict(
+        extra='forbid',
+    )
+    message_type: Literal['PPBC.ScheduleInstruction'] = 'PPBC.ScheduleInstruction'
+    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.',
+    )
+    power_profile_id: ID = Field(
+        ...,
+        description='ID of the PPBC.PowerProfileDefinition of which the PPBC.PowerSequence is being selected and scheduled by the CEM.',
+    )
+    sequence_container_id: ID = Field(
+        ...,
+        description='ID of the PPBC.PowerSequnceContainer 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.',
+    )
+    execution_time: AwareDatetime = 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',
+    )
 
-    abnormal_condition_only: bool = Field(
+
+class PPBCStartInterruptionInstruction(BaseModel):
+    model_config = ConfigDict(
+        extra='forbid',
+    )
+    message_type: Literal['PPBC.StartInterruptionInstruction'] = (
+        'PPBC.StartInterruptionInstruction'
+    )
+    message_id: ID
+    id: ID = Field(
         ...,
-        description="Indicates if this Transition may only be used during an abnormal condition (see Clause )",
+        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.',
     )
-    blocking_timers: List[ID] = Field(
+    power_profile_id: 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,
+        description='ID of the PPBC.PowerProfileDefinition of which the PPBC.PowerSequence is being interrupted by the CEM.',
     )
-    from_: ID = Field(
+    sequence_container_id: ID = Field(
+        ...,
+        description='ID of the PPBC.PowerSequnceContainer 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.'
+    )
+    execution_time: AwareDatetime = 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.',
+    )
+    abnormal_condition: bool = Field(
+        ...,
+        description='Indicates if this is an instruction during an abnormal condition',
+    )
+
+
+class PPBCEndInterruptionInstruction(BaseModel):
+    model_config = ConfigDict(
+        extra='forbid',
+    )
+    message_type: Literal['PPBC.EndInterruptionInstruction'] = (
+        'PPBC.EndInterruptionInstruction'
+    )
+    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.',
+    )
+    power_profile_id: ID = Field(
         ...,
-        alias="from",
-        description="ID of the OperationMode (exact type differs per ControlType) that should be switched from.",
+        description='ID of the PPBC.PowerProfileDefinition of which the PPBC.PowerSequence interruption is being ended by the CEM.',
     )
-    id: ID = Field(
+    sequence_container_id: ID = 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='ID of the PPBC.PowerSequnceContainer of which the PPBC.PowerSequence interruption is being ended by the CEM.',
     )
-    start_timers: List[ID] = Field(
+    power_sequence_id: ID = Field(
         ...,
-        description="List of IDs of Timers that will be (re)started when this transition is initiated",
-        max_items=1000,
-        min_items=0,
+        description='ID of the PPBC.PowerSequence for which the CEM wants to end the interruption.',
     )
-    to: ID = Field(
+    execution_time: AwareDatetime = 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.",
+        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.',
     )
-    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.",
+    abnormal_condition: bool = Field(
+        ...,
+        description='Indicates if this is an instruction during an abnormal condition',
     )
 
 
-class DDBCActuatorStatus(BaseModel):
-    class Config:
-        extra = Extra.forbid
-
-    active_operation_mode_id: ID = Field(
-        ...,
-        description="The operation mode that is presently active for this actuator.",
+class OMBCStatus(BaseModel):
+    model_config = ConfigDict(
+        extra='forbid',
     )
-    actuator_id: ID = Field(
-        ..., description="ID of the actuator this messages refers to"
+    message_type: Literal['OMBC.Status'] = 'OMBC.Status'
+    message_id: ID
+    active_operation_mode_id: ID = Field(
+        ..., description='ID of the active OMBC.OperationMode.'
     )
-    message_id: ID = Field(..., description="ID of this message")
-    message_type: str = Field("DDBC.ActuatorStatus", const=True)
     operation_mode_factor: float = 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='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.',
     )
     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.",
+        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.',
     )
-    transition_timestamp: Optional[datetime] = Field(
+    transition_timestamp: Optional[AwareDatetime] = 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.",
+        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 DDBCAverageDemandRateForecastElement(BaseModel):
-    class Config:
-        extra = Extra.forbid
-
-    demand_rate_expected: float = Field(
+class OMBCInstruction(BaseModel):
+    model_config = ConfigDict(
+        extra='forbid',
+    )
+    message_type: Literal['OMBC.Instruction'] = 'OMBC.Instruction'
+    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",
+        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_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",
+    execution_time: AwareDatetime = 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.',
     )
-    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",
+    operation_mode_id: ID = Field(
+        ..., description='ID of the OMBC.OperationMode that should be activated'
     )
-    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",
+    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.',
     )
-    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",
+    abnormal_condition: bool = Field(
+        ...,
+        description='Indicates if this is an instruction during an abnormal condition',
     )
-    demand_rate_upper_95PPR: Optional[float] = Field(
+
+
+class FRBCActuatorStatus(BaseModel):
+    model_config = ConfigDict(
+        extra='forbid',
+    )
+    message_type: Literal['FRBC.ActuatorStatus'] = 'FRBC.ActuatorStatus'
+    message_id: ID
+    actuator_id: ID = Field(
+        ..., description='ID of the actuator this messages refers to'
+    )
+    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.',
+    )
+    previous_operation_mode_id: Optional[ID] = Field(
         None,
-        description="The upper limit of the range with a 95\xa0% probability that the demand rate is within that range",
+        description='ID of the FRBC.OperationMode that was active before the present one. This value shall always be provided, unless the active FRBC.OperationMode is the first FRBC.OperationMode the Resource Manager is aware of.',
     )
-    demand_rate_upper_limit: Optional[float] = Field(
+    transition_timestamp: Optional[AwareDatetime] = Field(
         None,
-        description="The upper limit of the range with a 100\xa0% probability that the demand rate is within that range",
+        description='Time at which the transition from the previous FRBC.OperationMode to the active FRBC.OperationMode was initiated. This value shall always be provided, unless the active FRBC.OperationMode is the first FRBC.OperationMode the Resource Manager is aware of.',
     )
-    duration: Duration = Field(..., description="Duration of the element")
-
 
-class DDBCInstruction(BaseModel):
-    class Config:
-        extra = Extra.forbid
 
-    abnormal_condition: bool = Field(
-        ...,
-        description="Indicates if this is an instruction during an abnormal condition",
+class FRBCStorageStatus(BaseModel):
+    model_config = ConfigDict(
+        extra='forbid',
     )
-    actuator_id: ID = Field(
-        ..., description="ID of the actuator this Instruction belongs to."
+    message_type: Literal['FRBC.StorageStatus'] = 'FRBC.StorageStatus'
+    message_id: ID
+    present_fill_level: float = Field(
+        ..., description='Present fill level of the Storage'
     )
-    execution_time: datetime = Field(
-        ...,
-        description="Indicates the moment the execution of the instruction shall start",
+
+
+class FRBCLeakageBehaviour(BaseModel):
+    model_config = ConfigDict(
+        extra='forbid',
     )
-    id: ID = Field(
+    message_type: Literal['FRBC.LeakageBehaviour'] = 'FRBC.LeakageBehaviour'
+    message_id: ID
+    valid_from: AwareDatetime = 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='Moment this FRBC.LeakageBehaviour starts to be valid. If the FRBC.LeakageBehaviour is immediately valid, the DateTimeStamp should be now or in the past.',
     )
-    message_id: ID = Field(..., description="ID of this message")
-    message_type: str = Field("DDBC.Instruction", const=True)
-    operation_mode_factor: float = Field(
+    elements: List[FRBCLeakageBehaviourElement] = 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='List of elements that model the leakage behaviour of the buffer. The fill_level_ranges of the elements must be contiguous.',
+        max_length=288,
+        min_length=1,
     )
-    operation_mode_id: ID = Field(..., description="ID of the DDBC.OperationMode")
-
 
-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.",
+class FRBCInstruction(BaseModel):
+    model_config = ConfigDict(
+        extra='forbid',
     )
-    abnormal_condition_only: bool = Field(
+    message_type: Literal['FRBC.Instruction'] = 'FRBC.Instruction'
+    message_id: ID
+    id: ID = Field(
         ...,
-        description="Indicates if this DDBC.OperationMode may only be used 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.',
     )
-    diagnostic_label: Optional[str] = Field(
-        None,
-        description="Human readable name/description of the DDBC.OperationMode. This element is only intended for diagnostic purposes and not for HMI applications.",
+    actuator_id: ID = Field(
+        ..., description='ID of the actuator this instruction belongs to.'
     )
-    power_ranges: List[PowerRange] = Field(
+    operation_mode: ID = Field(
+        ..., description='ID of the FRBC.OperationMode that should be activated.'
+    )
+    operation_mode_factor: float = 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='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.',
     )
-    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.",
+    execution_time: AwareDatetime = 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.',
     )
-    supply_range: NumberRange = Field(
+    abnormal_condition: bool = 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='Indicates if this is an instruction during an abnormal condition.',
     )
 
 
-class DDBCTimerStatus(BaseModel):
-    class Config:
-        extra = Extra.forbid
-
-    actuator_id: ID = Field(
-        ..., description="The ID of the actuator the timer belongs to"
+class FRBCUsageForecast(BaseModel):
+    model_config = ConfigDict(
+        extra='forbid',
     )
-    finished_at: datetime = Field(
+    message_type: Literal['FRBC.UsageForecast'] = 'FRBC.UsageForecast'
+    message_id: ID
+    start_time: AwareDatetime = Field(
+        ..., description='Time at which the FRBC.UsageForecast starts.'
+    )
+    elements: List[FRBCUsageForecastElement] = 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='Further elements that model the profile. There shall be at least one element. Elements must be placed in chronological order.',
+        max_length=288,
+        min_length=1,
     )
-    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
+class FRBCFillLevelTargetProfile(BaseModel):
+    model_config = ConfigDict(
+        extra='forbid',
+    )
+    message_type: Literal['FRBC.FillLevelTargetProfile'] = 'FRBC.FillLevelTargetProfile'
+    message_id: ID
+    start_time: AwareDatetime = Field(
+        ..., description='Time at which the FRBC.FillLevelTargetProfile starts.'
+    )
+    elements: List[FRBCFillLevelTargetProfileElement] = 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_length=288,
+        min_length=1,
+    )
 
-    active_operation_mode_id: ID = Field(
-        ..., description="ID of the FRBC.OperationMode that is presently active."
+
+class DDBCActuatorStatus(BaseModel):
+    model_config = ConfigDict(
+        extra='forbid',
     )
+    message_type: Literal['DDBC.ActuatorStatus'] = 'DDBC.ActuatorStatus'
+    message_id: ID
     actuator_id: ID = Field(
-        ..., description="ID of the actuator this messages refers to"
+        ..., description='ID of the actuator this messages refers to'
+    )
+    active_operation_mode_id: ID = Field(
+        ...,
+        description='The operation mode that is presently active for this actuator.',
     )
-    message_id: ID = Field(..., description="ID of this message")
-    message_type: str = Field("FRBC.ActuatorStatus", const=True)
     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.",
+        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.',
     )
     previous_operation_mode_id: Optional[ID] = Field(
         None,
-        description="ID of the FRBC.OperationMode that was active before the present one. This value shall always be provided, unless the active FRBC.OperationMode is the first FRBC.OperationMode the Resource Manager is aware of.",
+        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.',
     )
-    transition_timestamp: Optional[datetime] = Field(
+    transition_timestamp: Optional[AwareDatetime] = Field(
         None,
-        description="Time at which the transition from the previous FRBC.OperationMode to the active FRBC.OperationMode was initiated. This value shall always be provided, unless the active FRBC.OperationMode is the first FRBC.OperationMode the Resource Manager is aware of.",
+        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 FRBCFillLevelTargetProfileElement(BaseModel):
-    class Config:
-        extra = Extra.forbid
-
-    duration: Duration = Field(..., description="The duration of the element.")
-    fill_level_range: NumberRange = 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.",
+class DDBCInstruction(BaseModel):
+    model_config = ConfigDict(
+        extra='forbid',
     )
-
-
-class FRBCInstruction(BaseModel):
-    class Config:
-        extra = Extra.forbid
-
-    abnormal_condition: bool = Field(
+    message_type: Literal['DDBC.Instruction'] = 'DDBC.Instruction'
+    message_id: ID
+    id: ID = Field(
         ...,
-        description="Indicates if this is an instruction during an abnormal condition.",
+        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.',
     )
-    actuator_id: ID = Field(
-        ..., description="ID of the actuator this instruction belongs to."
-    )
-    execution_time: datetime = Field(
-        ..., description="Time when instruction should be executed."
+    execution_time: AwareDatetime = 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.',
     )
-    id: ID = Field(
+    abnormal_condition: 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 if this is an instruction during an abnormal condition',
     )
-    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."
+    actuator_id: ID = Field(
+        ..., description='ID of the actuator this Instruction belongs to.'
     )
+    operation_mode_id: ID = Field(..., description='ID of the DDBC.OperationMode')
     operation_mode_factor: float = Field(
         ...,
-        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.",
+        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.',
     )
 
 
-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.",
+class DDBCAverageDemandRateForecast(BaseModel):
+    model_config = ConfigDict(
+        extra='forbid',
     )
-    leakage_rate: float = Field(
+    message_type: Literal['DDBC.AverageDemandRateForecast'] = (
+        'DDBC.AverageDemandRateForecast'
+    )
+    message_id: ID
+    start_time: AwareDatetime = Field(..., description='Start time of the profile.')
+    elements: List[DDBCAverageDemandRateForecastElement] = 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='Elements of the profile. Elements must be placed in chronological order.',
+        max_length=288,
+        min_length=1,
     )
 
 
-class FRBCOperationModeElement(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.",
+class PowerValue(BaseModel):
+    model_config = ConfigDict(
+        extra='forbid',
     )
-    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. ",
+    commodity_quantity: CommodityQuantity = Field(
+        ..., description='The power quantity the value refers to'
     )
-    power_ranges: List[PowerRange] = Field(
+    value: float = 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="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='Power value expressed in the unit associated with the CommodityQuantity',
     )
 
 
-class FRBCStorageDescription(BaseModel):
-    class Config:
-        extra = Extra.forbid
-
-    diagnostic_label: Optional[str] = Field(
+class PowerForecastValue(BaseModel):
+    model_config = ConfigDict(
+        extra='forbid',
+    )
+    value_upper_limit: Optional[float] = 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.",
+        description='The upper boundary of the range with 100 % certainty the power value is in it',
     )
-    fill_level_label: Optional[str] = Field(
+    value_upper_95PPR: Optional[float] = 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.",
+        description='The upper boundary of the range with 95 % certainty the power value is in it',
     )
-    fill_level_range: NumberRange = 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). ",
+    value_upper_68PPR: Optional[float] = Field(
+        None,
+        description='The upper boundary of the range with 68 % certainty the power value is in it',
     )
-    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.",
+    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',
     )
-    provides_leakage_behaviour: bool = Field(
-        ...,
-        description="Indicates whether the Storage could provide details of power leakage behaviour through the FRBC.LeakageBehaviour.",
+    value_lower_95PPR: Optional[float] = Field(
+        None,
+        description='The lower boundary of the range with 95 % certainty the power value is in it',
     )
-    provides_usage_forecast: bool = Field(
-        ...,
-        description="Indicates whether the Storage could provide a UsageForecast through the FRBC.UsageForecast.",
+    value_lower_limit: Optional[float] = Field(
+        None,
+        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 FRBCStorageStatus(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"
+class PowerRange(BaseModel):
+    model_config = ConfigDict(
+        extra='forbid',
+    )
+    start_of_range: float = Field(
+        ..., description='Power value that defines the start of the range.'
+    )
+    end_of_range: float = Field(
+        ..., description='Power value that defines the end of the range.'
+    )
+    commodity_quantity: CommodityQuantity = Field(
+        ..., description='The power quantity the values refer to'
     )
 
 
-class FRBCTimerStatus(BaseModel):
-    class Config:
-        extra = Extra.forbid
+class Role(BaseModel):
+    model_config = ConfigDict(
+        extra='forbid',
+    )
+    role: RoleType = Field(
+        ..., description='Role type of the Resource Manager for the given commodity'
+    )
+    commodity: Commodity = Field(..., description='Commodity the role refers to.')
 
-    actuator_id: ID = Field(
-        ..., description="The ID of the actuator the timer belongs to"
+
+class PowerForecastElement(BaseModel):
+    model_config = ConfigDict(
+        extra='forbid',
     )
-    finished_at: datetime = Field(
+    duration: Duration = Field(..., description='Duration of the PowerForecastElement')
+    power_values: List[PowerForecastValue] = 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 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_length=10,
+        min_length=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 Config:
-        extra = Extra.forbid
 
-    elements: List[FRBCUsageForecastElement] = Field(
+class PEBCAllowedLimitRange(BaseModel):
+    model_config = ConfigDict(
+        extra='forbid',
+    )
+    commodity_quantity: CommodityQuantity = Field(
+        ..., description='Type of power quantity this PEBC.AllowedLimitRange applies to'
+    )
+    limit_type: PEBCPowerEnvelopeLimitType = Field(
         ...,
-        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,
+        description='Indicates if this ranges applies to the upper limit or the lower limit',
     )
-    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."
+    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. ',
+    )
+    abnormal_condition_only: bool = Field(
+        ...,
+        description='Indicates if this PEBC.AllowedLimitRange may only be used during an abnormal condition',
     )
 
 
-class Handshake(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"
+class PEBCPowerEnvelope(BaseModel):
+    model_config = ConfigDict(
+        extra='forbid',
     )
-    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,
+    id: ID = 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.',
     )
-
-
-class HandshakeResponse(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"
+    commodity_quantity: CommodityQuantity = Field(
+        ..., description='Type of power quantity this PEBC.PowerEnvelope applies to'
+    )
+    power_envelope_elements: List[PEBCPowerEnvelopeElement] = Field(
+        ...,
+        description='The elements of this PEBC.PowerEnvelope. Shall contain at least one element. Elements must be placed in chronological order.',
+        max_length=288,
+        min_length=1,
     )
 
 
-class OMBCOperationMode(BaseModel):
-    class Config:
-        extra = Extra.forbid
-
-    abnormal_condition_only: bool = Field(
+class PPBCPowerSequenceElement(BaseModel):
+    model_config = ConfigDict(
+        extra='forbid',
+    )
+    duration: Duration = Field(
+        ..., description='Duration of the PPBC.PowerSequenceElement.'
+    )
+    power_values: List[PowerForecastValue] = Field(
         ...,
-        description="Indicates if this OMBC.OperationMode may only be used during an abnormal condition.",
+        description='The value of power and deviations for the given duration. The array should contain at least one PowerForecastValue and at most one PowerForecastValue per CommodityQuantity.',
+        max_length=10,
+        min_length=1,
     )
-    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.",
+
+
+class PPBCPowerSequenceContainerStatus(BaseModel):
+    model_config = ConfigDict(
+        extra='forbid',
     )
-    id: ID = Field(
+    power_profile_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.",
+        description='ID of the PPBC.PowerProfileDefinition of which the data element ‘sequence_container_id’ refers to. ',
     )
-    power_ranges: List[PowerRange] = Field(
+    sequence_container_id: ID = 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 PPBC.PowerSequenceContainer this PPBC.PowerSequenceContainerStatus provides information about.',
     )
-    running_costs: Optional[NumberRange] = Field(
+    selected_sequence_id: Optional[ID] = 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='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 OMBCSystemDescription(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,
+class OMBCOperationMode(BaseModel):
+    model_config = ConfigDict(
+        extra='forbid',
     )
-    timers: List[Timer] = Field(
+    id: ID = Field(
         ...,
-        description="Timers that control when certain transitions can be made.",
-        max_items=1000,
-        min_items=0,
+        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.',
     )
-    transitions: List[Transition] = 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="Possible transitions to switch from one OMBC.OperationMode to another.",
-        max_items=1000,
-        min_items=0,
+        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_length=10,
+        min_length=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.',
     )
-    valid_from: datetime = Field(
+    abnormal_condition_only: bool = 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.",
+        description='Indicates if this OMBC.OperationMode may only be used during an abnormal condition.',
     )
 
 
-class PEBCAllowedLimitRange(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",
+class FRBCOperationModeElement(BaseModel):
+    model_config = ConfigDict(
+        extra='forbid',
     )
-    commodity_quantity: CommodityQuantity = Field(
-        ..., description="Type of power quantity this PEBC.AllowedLimitRange applies to"
+    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.',
     )
-    limit_type: PEBCPowerEnvelopeLimitType = Field(
+    fill_rate: NumberRange = Field(
         ...,
-        description="Indicates if this ranges applies to the upper limit or the lower limit",
+        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. ',
     )
-    range_boundary: NumberRange = Field(
+    power_ranges: List[PowerRange] = 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. ",
+        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_length=10,
+        min_length=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 PEBCPowerConstraints(BaseModel):
-    class Config:
-        extra = Extra.forbid
-
-    allowed_limit_ranges: List[PEBCAllowedLimitRange] = Field(
+class DDBCOperationMode(BaseModel):
+    model_config = ConfigDict(
+        extra='forbid',
+    )
+    Id: ID = 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,
+        description='ID of this operation mode. Must be unique in the scope of the DDBC.ActuatorDescription in which it is used.',
     )
-    consequence_type: PEBCPowerEnvelopeConsequenceType = Field(
-        ..., description="Type of consequence of limiting power"
+    diagnostic_label: Optional[str] = Field(
+        None,
+        description='Human readable name/description of the DDBC.OperationMode. This element is only intended for diagnostic purposes and not for HMI applications.',
     )
-    id: ID = Field(
+    power_ranges: List[PowerRange] = 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.",
+        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_length=10,
+        min_length=1,
     )
-    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"
+    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.',
     )
-    valid_until: Optional[datetime] = Field(
+    running_costs: Optional[NumberRange] = 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='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.',
+    )
+    abnormal_condition_only: bool = Field(
+        ...,
+        description='Indicates if this DDBC.OperationMode may only be used during an abnormal condition.',
     )
 
 
-class PEBCPowerEnvelope(BaseModel):
-    class Config:
-        extra = Extra.forbid
-
-    commodity_quantity: CommodityQuantity = Field(
-        ..., description="Type of power quantity this PEBC.PowerEnvelope applies to"
-    )
-    id: ID = 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.",
+class ResourceManagerDetails(BaseModel):
+    model_config = ConfigDict(
+        extra='forbid',
     )
-    power_envelope_elements: List[PEBCPowerEnvelopeElement] = Field(
+    message_type: Literal['ResourceManagerDetails'] = 'ResourceManagerDetails'
+    message_id: ID
+    resource_id: ID = 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='Identifier of the Resource Manager. Must be unique within the scope of the CEM.',
     )
-
-
-class PPBCPowerSequenceContainerStatus(BaseModel):
-    class Config:
-        extra = Extra.forbid
-
-    power_profile_id: ID = Field(
+    name: Optional[str] = Field(None, description='Human readable name given by user')
+    roles: List[Role] = Field(
         ...,
-        description="ID of the PPBC.PowerProfileDefinition of which the data element ‘sequence_container_id’ refers to. ",
+        description='Each Resource Manager provides one or more energy Roles',
+        max_length=3,
+        min_length=1,
     )
-    progress: Optional[Duration] = Field(
+    manufacturer: Optional[str] = Field(None, description='Name of Manufacturer')
+    model: Optional[str] = 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='Name of the model of the device (provided by the manufacturer)',
     )
-    selected_sequence_id: Optional[ID] = Field(
+    serial_number: Optional[str] = Field(
+        None, description='Serial number of the device (provided by the manufacturer)'
+    )
+    firmware_version: Optional[str] = Field(
         None,
-        description="ID of selected PPBC.PowerSequence. When no ID is given, no sequence was selected yet.",
+        description='Version identifier of the firmware used in the device (provided by the manufacturer)',
     )
-    sequence_container_id: ID = Field(
+    instruction_processing_delay: Duration = Field(
         ...,
-        description="ID of the PPBC.PowerSequenceContainer this PPBC.PowerSequenceContainerStatus provides information about.",
+        description='The average time the combination of Resource Manager and HBES/BACS/SASS or (Smart) device needs to process and execute an instruction',
     )
-    status: PPBCPowerSequenceStatus = Field(
-        ..., description="Status of the selected PPBC.PowerSequence"
+    available_control_types: List[ControlType] = Field(
+        ...,
+        description='The control types supported by this Resource Manager.',
+        max_length=5,
+        min_length=1,
     )
-
-
-class PPBCPowerSequenceElement(BaseModel):
-    class Config:
-        extra = Extra.forbid
-
-    duration: Duration = Field(
-        ..., description="Duration of the PPBC.PowerSequenceElement."
+    currency: Optional[Currency] = Field(
+        None,
+        description='Currency to be used for all information regarding costs. Mandatory if cost information is published.',
     )
-    power_values: List[PowerForecastValue] = Field(
+    provides_forecast: bool = Field(
         ...,
-        description="The value of power and deviations for the given duration. The array should contain at least one PowerForecastValue and at most one PowerForecastValue per CommodityQuantity.",
-        max_items=10,
-        min_items=1,
+        description='Indicates whether the ResourceManager is able to provide PowerForecasts',
     )
-
-
-class PowerForecastElement(BaseModel):
-    class Config:
-        extra = Extra.forbid
-
-    duration: Duration = Field(..., description="Duration of the PowerForecastElement")
-    power_values: List[PowerForecastValue] = Field(
+    provides_power_measurement_types: List[CommodityQuantity] = 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='Array of all CommodityQuantities that this Resource Manager can provide measurements for. ',
+        max_length=10,
+        min_length=1,
     )
 
 
 class PowerMeasurement(BaseModel):
-    class Config:
-        extra = Extra.forbid
-
-    measurement_timestamp: datetime = Field(
-        ..., description="Timestamp when PowerValues were measured."
+    model_config = ConfigDict(
+        extra='forbid',
+    )
+    message_type: Literal['PowerMeasurement'] = 'PowerMeasurement'
+    message_id: ID
+    measurement_timestamp: AwareDatetime = Field(
+        ..., description='Timestamp when PowerValues were measured.'
     )
-    message_id: ID = Field(..., description="ID of this message")
-    message_type: str = Field("PowerMeasurement", const=True)
     values: List[PowerValue] = Field(
         ...,
-        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,
+        description='Array of measured PowerValues. Must contain at least one item and at most one item per ‘commodity_quantity’ (defined inside the PowerValue).',
+        max_length=10,
+        min_length=1,
     )
 
 
-class ReceptionStatus(BaseModel):
-    class Config:
-        extra = Extra.forbid
-
-    diagnostic_label: Optional[str] = Field(
-        None,
-        description="Diagnostic label that can be used to provide additional information for debugging. However, not for HMI purposes.",
+class PowerForecast(BaseModel):
+    model_config = ConfigDict(
+        extra='forbid',
     )
-    message_type: str = Field("ReceptionStatus", const=True)
-    status: ReceptionStatusValues = Field(
-        ..., description="Enumeration of status values"
+    message_type: Literal['PowerForecast'] = 'PowerForecast'
+    message_id: ID
+    start_time: AwareDatetime = Field(
+        ..., description='Start time of time period that is covered by the profile.'
     )
-    subject_message_id: ID = Field(
-        ..., description="The message this ReceptionStatus refers to"
+    elements: List[PowerForecastElement] = Field(
+        ...,
+        description='Elements of which this forecast consists. Contains at least one element. Elements must be placed in chronological order.',
+        max_length=288,
+        min_length=1,
     )
 
 
-class Role(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"
+class PEBCPowerConstraints(BaseModel):
+    model_config = ConfigDict(
+        extra='forbid',
     )
-
-
-class SessionRequest(BaseModel):
-    class Config:
-        extra = Extra.forbid
-
-    diagnostic_label: Optional[str] = Field(
+    message_type: Literal['PEBC.PowerConstraints'] = 'PEBC.PowerConstraints'
+    message_id: ID
+    id: ID = 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.',
+    )
+    valid_from: AwareDatetime = Field(
+        ..., description='Moment this PEBC.PowerConstraints start to be valid'
+    )
+    valid_until: Optional[AwareDatetime] = Field(
         None,
-        description="Optional field for a human readible descirption for debugging purposes",
+        description='Moment until this PEBC.PowerConstraints is valid. If valid_until is not present, there is no determined end time of this PEBC.PowerConstraints.',
+    )
+    consequence_type: PEBCPowerEnvelopeConsequenceType = Field(
+        ..., description='Type of consequence of limiting power'
+    )
+    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_length=100,
+        min_length=2,
     )
-    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 Config:
-        extra = Extra.forbid
 
-    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.",
+class PEBCInstruction(BaseModel):
+    model_config = ConfigDict(
+        extra='forbid',
     )
+    message_type: Literal['PEBC.Instruction'] = 'PEBC.Instruction'
+    message_id: ID
     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='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.',
     )
-    operation_modes: List[DDBCOperationMode] = Field(
+    execution_time: AwareDatetime = Field(
         ...,
-        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,
+        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.',
     )
-    supported_commodites: List[Commodity] = Field(
+    abnormal_condition: bool = 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='Indicates if this is an instruction during an abnormal condition.',
     )
-    timers: List[Timer] = Field(
+    power_constraints_id: ID = Field(
         ...,
-        description="List of Timers associated with Transitions for this Actuator. Can be empty.",
-        max_items=1000,
-        min_items=0,
+        description='Identifier of the PEBC.PowerConstraints this PEBC.Instruction was based on.',
     )
-    transitions: List[Transition] = Field(
+    power_envelopes: List[PEBCPowerEnvelope] = Field(
         ...,
-        description="List of Transitions between Operation Modes. Shall contain at least one Transition.",
-        max_items=1000,
-        min_items=0,
+        description='The PEBC.PowerEnvelope(s) that should be followed by the Resource Manager. There shall be at least one PEBC.PowerEnvelope, but at most one PEBC.PowerEnvelope for each CommodityQuantity.',
+        max_length=10,
+        min_length=1,
     )
 
 
-class DDBCAverageDemandRateForecast(BaseModel):
-    class Config:
-        extra = Extra.forbid
-
-    elements: List[DDBCAverageDemandRateForecastElement] = Field(
+class PPBCPowerProfileStatus(BaseModel):
+    model_config = ConfigDict(
+        extra='forbid',
+    )
+    message_type: Literal['PPBC.PowerProfileStatus'] = 'PPBC.PowerProfileStatus'
+    message_id: ID
+    sequence_container_status: List[PPBCPowerSequenceContainerStatus] = Field(
         ...,
-        description="Elements of the profile. Elements must be placed in chronological order.",
-        max_items=288,
-        min_items=1,
+        description='Array with status information for all PPBC.PowerSequenceContainers in the PPBC.PowerProfileDefinition.',
+        max_length=1000,
+        min_length=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(
+class OMBCSystemDescription(BaseModel):
+    model_config = ConfigDict(
+        extra='forbid',
+    )
+    message_type: Literal['OMBC.SystemDescription'] = 'OMBC.SystemDescription'
+    message_id: ID
+    valid_from: AwareDatetime = Field(
         ...,
-        description="List of all available actuators in the system. Must contain at least one DDBC.ActuatorAggregated.",
-        max_items=10,
-        min_items=1,
+        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.',
     )
-    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"
+    operation_modes: List[OMBCOperationMode] = Field(
+        ...,
+        description='OMBC.OperationModes available for the CEM in order to coordinate the device behaviour.',
+        max_length=100,
+        min_length=1,
     )
-    provides_average_demand_rate_forecast: bool = Field(
+    transitions: List[Transition] = Field(
         ...,
-        description="Indicates whether the Resource Manager could provide a demand rate forecast through the DDBC.AverageDemandRateForecast.",
+        description='Possible transitions to switch from one OMBC.OperationMode to another.',
+        max_length=1000,
+        min_length=0,
     )
-    valid_from: datetime = Field(
+    timers: List[Timer] = 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='Timers that control when certain transitions can be made.',
+        max_length=1000,
+        min_length=0,
     )
 
 
-class FRBCFillLevelTargetProfile(BaseModel):
-    class Config:
-        extra = Extra.forbid
-
-    elements: List[FRBCFillLevelTargetProfileElement] = Field(
+class PPBCPowerSequence(BaseModel):
+    model_config = ConfigDict(
+        extra='forbid',
+    )
+    id: ID = 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,
-        min_items=1,
+        description='ID of the PPBC.PowerSequence. Must be unique in the scope of the PPBC.PowerSequnceContainer in which it is used.',
     )
-    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."
+    elements: List[PPBCPowerSequenceElement] = Field(
+        ...,
+        description='List of PPBC.PowerSequenceElements. Shall contain at least one element. Elements must be placed in chronological order.',
+        max_length=288,
+        min_length=1,
     )
-
-
-class FRBCLeakageBehaviour(BaseModel):
-    class Config:
-        extra = Extra.forbid
-
-    elements: List[FRBCLeakageBehaviourElement] = Field(
+    is_interruptible: bool = 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,
+        description='Indicates whether the option of pausing a sequence is available.',
     )
-    message_id: ID = Field(..., description="ID of this message")
-    message_type: str = Field("FRBC.LeakageBehaviour", const=True)
-    valid_from: datetime = Field(
+    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="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='Indicates if this PPBC.PowerSequence may only be used during an abnormal condition',
     )
 
 
 class FRBCOperationMode(BaseModel):
-    class Config:
-        extra = Extra.forbid
-
-    abnormal_condition_only: bool = Field(
+    model_config = ConfigDict(
+        extra='forbid',
+    )
+    id: ID = Field(
         ...,
-        description="Indicates if this FRBC.OperationMode may only be used during an abnormal condition",
+        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.",
+        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,
+        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_length=100,
+        min_length=1,
     )
-    id: ID = Field(
+    abnormal_condition_only: bool = Field(
         ...,
-        description="ID of the FRBC.OperationMode. Must be unique in the scope of the FRBC.ActuatorDescription in which it is used.",
+        description='Indicates if this FRBC.OperationMode may only be used during an abnormal condition',
     )
 
 
-class PEBCInstruction(BaseModel):
-    class Config:
-        extra = Extra.forbid
-
-    abnormal_condition: bool = Field(
-        ...,
-        description="Indicates if this is an instruction during an abnormal condition.",
+class DDBCActuatorDescription(BaseModel):
+    model_config = ConfigDict(
+        extra='forbid',
     )
-    execution_time: datetime = Field(
+    id: ID = Field(
         ...,
-        description="Indicates the moment the execution of the instruction shall start.",
+        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.',
     )
-    id: ID = Field(
+    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.',
+    )
+    supported_commodites: List[Commodity] = 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='Commodities supported by the operation modes of this actuator. There shall be at least one commodity',
+        max_length=4,
+        min_length=1,
     )
-    message_id: ID = Field(..., description="ID of this message")
-    message_type: str = Field("PEBC.Instruction", const=True)
-    power_constraints_id: ID = Field(
+    operation_modes: List[DDBCOperationMode] = Field(
         ...,
-        description="Identifier of the PEBC.PowerConstraints this PEBC.Instruction was based on.",
+        description='List of all Operation Modes that are available for this actuator. There shall be at least one DDBC.OperationMode.',
+        max_length=100,
+        min_length=1,
     )
-    power_envelopes: List[PEBCPowerEnvelope] = Field(
+    transitions: List[Transition] = Field(
         ...,
-        description="The PEBC.PowerEnvelope(s) that should be followed by the Resource Manager. There shall be at least one PEBC.PowerEnvelope, but at most one PEBC.PowerEnvelope for each CommodityQuantity.",
-        max_items=10,
-        min_items=1,
+        description='List of Transitions between Operation Modes. Shall contain at least one Transition.',
+        max_length=1000,
+        min_length=0,
     )
-
-
-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)
-    sequence_container_status: List[PPBCPowerSequenceContainerStatus] = Field(
+    timers: List[Timer] = Field(
         ...,
-        description="Array with status information for all PPBC.PowerSequenceContainers in the PPBC.PowerProfileDefinition.",
-        max_items=1000,
-        min_items=1,
+        description='List of Timers associated with Transitions for this Actuator. Can be empty.',
+        max_length=1000,
+        min_length=0,
     )
 
 
-class PPBCPowerSequence(BaseModel):
-    class Config:
-        extra = Extra.forbid
-
-    abnormal_condition_only: bool = Field(
-        ...,
-        description="Indicates if this PPBC.PowerSequence may only be used during an abnormal condition",
+class DDBCSystemDescription(BaseModel):
+    model_config = ConfigDict(
+        extra='forbid',
     )
-    elements: List[PPBCPowerSequenceElement] = Field(
+    message_type: Literal['DDBC.SystemDescription'] = 'DDBC.SystemDescription'
+    message_id: ID
+    valid_from: AwareDatetime = Field(
         ...,
-        description="List of PPBC.PowerSequenceElements. Shall contain at least one element. Elements must be placed in chronological order.",
-        max_items=288,
-        min_items=1,
+        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.',
     )
-    id: ID = Field(
+    actuators: List[DDBCActuatorDescription] = Field(
         ...,
-        description="ID of the PPBC.PowerSequence. Must be unique in the scope of the PPBC.PowerSequnceContainer in which it is used.",
+        description='List of all available actuators in the system. Must contain at least one DDBC.ActuatorAggregated.',
+        max_length=10,
+        min_length=1,
     )
-    is_interruptible: bool = Field(
-        ...,
-        description="Indicates whether the option of pausing a sequence is available.",
+    present_demand_rate: NumberRange = Field(
+        ..., description='Present demand rate that needs to be satisfied by the system'
     )
-    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",
+    provides_average_demand_rate_forecast: bool = Field(
+        ...,
+        description='Indicates whether the Resource Manager could provide a demand rate forecast through the DDBC.AverageDemandRateForecast.',
     )
 
 
 class PPBCPowerSequenceContainer(BaseModel):
-    class Config:
-        extra = Extra.forbid
-
+    model_config = ConfigDict(
+        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.PowerSequenceContainer. Must be unique in the scope of the PPBC.PowerProfileDefinition in which it is used.',
     )
     power_sequences: List[PPBCPowerSequence] = Field(
         ...,
-        description="List of alternative Sequences where one could be chosen by the CEM",
-        max_items=288,
-        min_items=1,
-    )
-
-
-class PowerForecast(BaseModel):
-    class Config:
-        extra = Extra.forbid
-
-    elements: List[PowerForecastElement] = Field(
-        ...,
-        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,
-    )
-    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."
+        description='List of alternative Sequences where one could be chosen by the CEM',
+        max_length=288,
+        min_length=1,
     )
 
 
-class ResourceManagerDetails(BaseModel):
-    class Config:
-        extra = Extra.forbid
-
-    available_control_types: List[ControlType] = Field(
-        ...,
-        description="The control types supported by this Resource Manager.",
-        max_items=5,
-        min_items=1,
-    )
-    currency: Optional[Currency] = Field(
-        None,
-        description="Currency to be used for all information regarding costs. Mandatory if cost information is published.",
-    )
-    firmware_version: Optional[str] = Field(
-        None,
-        description="Version identifier of the firmware used in the device (provided by the manufacturer)",
+class FRBCActuatorDescription(BaseModel):
+    model_config = ConfigDict(
+        extra='forbid',
     )
-    instruction_processing_delay: Duration = Field(
+    id: ID = 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='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.',
     )
-    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(
+    diagnostic_label: Optional[str] = Field(
         None,
-        description="Name of the model of the device (provided by the manufacturer)",
+        description='Human readable name/description for the actuator. This element is only intended for diagnostic purposes and not for HMI applications.',
     )
-    name: Optional[str] = Field(None, description="Human readable name given by user")
-    provides_forecast: bool = Field(
+    supported_commodities: List[Commodity] = Field(
         ...,
-        description="Indicates whether the ResourceManager is able to provide PowerForecasts",
+        description='List of all supported Commodities.',
+        max_length=4,
+        min_length=1,
     )
-    provides_power_measurement_types: List[CommodityQuantity] = Field(
+    operation_modes: List[FRBCOperationMode] = Field(
         ...,
-        description="Array of all CommodityQuantities that this Resource Manager can provide measurements for. ",
-        max_items=10,
-        min_items=1,
+        description='Provided FRBC.OperationModes associated with this actuator',
+        max_length=100,
+        min_length=1,
     )
-    resource_id: ID = Field(
+    transitions: List[Transition] = Field(
         ...,
-        description="Identifier of the Resource Manager. Must be unique within the scope of the CEM.",
+        description='Possible transitions between FRBC.OperationModes associated with this actuator.',
+        max_length=1000,
+        min_length=0,
     )
-    roles: List[Role] = Field(
+    timers: List[Timer] = Field(
         ...,
-        description="Each Resource Manager provides one or more energy Roles",
-        max_items=3,
-        min_items=1,
-    )
-    serial_number: Optional[str] = Field(
-        None, description="Serial number of the device (provided by the manufacturer)"
+        description='List of Timers associated with this actuator',
+        max_length=1000,
+        min_length=0,
     )
 
 
-class FRBCActuatorDescription(BaseModel):
-    class Config:
-        extra = Extra.forbid
-
-    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.",
+class PPBCPowerProfileDefinition(BaseModel):
+    model_config = ConfigDict(
+        extra='forbid',
     )
+    message_type: Literal['PPBC.PowerProfileDefinition'] = 'PPBC.PowerProfileDefinition'
+    message_id: ID
     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.",
+        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.',
     )
-    operation_modes: List[FRBCOperationMode] = Field(
+    start_time: AwareDatetime = Field(
         ...,
-        description="Provided FRBC.OperationModes associated with this actuator",
-        max_items=100,
-        min_items=1,
-    )
-    supported_commodities: List[Commodity] = Field(
-        ..., description="List of all supported Commodities.", max_items=4, min_items=1
+        description='Indicates the first possible time the first PPBC.PowerSequence could start',
     )
-    timers: List[Timer] = Field(
+    end_time: AwareDatetime = Field(
         ...,
-        description="List of Timers associated with this actuator",
-        max_items=1000,
-        min_items=0,
+        description='Indicates when the last PPBC.PowerSequence shall be finished at the latest',
     )
-    transitions: List[Transition] = Field(
+    power_sequences_containers: List[PPBCPowerSequenceContainer] = Field(
         ...,
-        description="Possible transitions between FRBC.OperationModes associated with this actuator.",
-        max_items=1000,
-        min_items=0,
+        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_length=1000,
+        min_length=1,
     )
 
 
 class FRBCSystemDescription(BaseModel):
-    class Config:
-        extra = Extra.forbid
-
-    actuators: List[FRBCActuatorDescription] = Field(
-        ..., description="Details of all Actuators.", max_items=10, min_items=1
-    )
-    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(
-        ...,
-        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.",
-    )
-
-
-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.",
+    model_config = ConfigDict(
+        extra='forbid',
     )
-    message_id: ID = Field(..., description="ID of this message")
-    message_type: str = Field("PPBC.PowerProfileDefinition", const=True)
-    power_sequences_containers: List[PPBCPowerSequenceContainer] = Field(
+    message_type: Literal['FRBC.SystemDescription'] = 'FRBC.SystemDescription'
+    message_id: ID
+    valid_from: AwareDatetime = 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,
+        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.',
     )
-    start_time: datetime = Field(
-        ...,
-        description="Indicates the first possible time the first PPBC.PowerSequence could start",
+    actuators: List[FRBCActuatorDescription] = Field(
+        ..., description='Details of all Actuators.', max_length=10, min_length=1
     )
+    storage: FRBCStorageDescription = Field(..., description='Details of the storage.')