diff --git a/CHANGELOG.md b/CHANGELOG.md
index 249aea2d..8ba79dfe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added
* `ReferenceMessageID` attribute in `PayloadMessageResponseType` to replace the specific `*MessageID` attributes in each specific response type. This will simplify handling of response messages.
+* `DefaultBaseline` and `Baseline` attributes (optional) added to ISP types, to communicate intent and allow more validations.
### Removed
* Specific `*MessageID` attributes in each response type. These have been replaced by the generic `ReferenceMessageID` attribute in the `PayloadMessageResponseType`.
diff --git a/docs/general-description/usef-general-concepts.md b/docs/general-description/usef-general-concepts.md
index 3f7403ec..6415c268 100644
--- a/docs/general-description/usef-general-concepts.md
+++ b/docs/general-description/usef-general-concepts.md
@@ -93,9 +93,13 @@ Flexibility is expressed in Power [Watts] which is to be interpreted as the aver
All flexibility trading in USEF assumes that flexibility offers take the form of deviation from baseline, i.e. the default situation that would occur if no flexibility were activated.
Typically, the baseline is derived via an AGR nomination referred to as the D-prognosis.
+
However, UFTP allows for alternative baseline, where a D-prognosis is not required, and it is assumed that the AGR and DSO agree upon the baseline.
An alternative baseline could be based on a measurement (MBMA-method), a mathematical formula or a reference group, etc.
The choice of the alternative baseline and its establishment is out-of-scope for UFTP.
+
The UFTP trading messages either refer to D-prognosis or to an external baseline reference.
Throughout this document, the D-prognosis is used as the default baseline method.
If UFTP is used with alternative baseline, then all references to the D-prognosis can be ignored.
+
+Baselines can be included in the ISPs when requesting or activating flexibility, to communicate the intent and allow better validations in case there was already flexibility activated before on that same ISP.
\ No newline at end of file
diff --git a/docs/message-descriptions/message-catalog/flex-order.md b/docs/message-descriptions/message-catalog/flex-order.md
index 36f4e1dd..768ff4ce 100644
--- a/docs/message-descriptions/message-catalog/flex-order.md
+++ b/docs/message-descriptions/message-catalog/flex-order.md
@@ -17,6 +17,7 @@ This ISP list should be copied from the FlexOffer message without modification:
CongestionPoint = EntityAddress
FlexOfferMessageID = UUID
ContractID = Text (only if the offer and order refer to a bilateral contract)
+ ServiceType = String (optional)
D-PrognosisMessageID = UUID (if present)
BaselineReference = Text (if present)
Price = CurrencyAmount
@@ -26,6 +27,8 @@ This ISP list should be copied from the FlexOffer message without modification:
ActivationFactor = Number (optional [0.01-1.00])
@@ -39,7 +42,8 @@ This ISP list should be copied from the FlexOffer message without modification:
| CongestionPoint | Entity Address of the Congestion Point this FlexOrder message applies to |
| FlexOfferMessageID | MessageID of the FlexOffer message this order is based on. |
| ContractID | Reference to the bilateral contract in question, if applicable. |
-| D-PrognosisMessageID | MessageID of the D-Prognosis this order is based on, if present |
+| ServiceType | Service type for this order, the service type determines response characteristics such as latency or asset participation type. Each contract may specify multiple service-types. |
+| D-PrognosisMessageID | MessageID of the D-Prognosis this order is based on, if present. |
| BaselineReference | Identification of the baseline prognosis, if another baseline methodology is used than based on D-prognoses. |
| Price | The price for the flexibility ordered. Usually, the price should match the price of the related FlexOffer. |
| Currency | ISO 4217 code indicating the currency that applies to the price of the FlexOrder. |
@@ -48,5 +52,7 @@ This ISP list should be copied from the FlexOffer message without modification:
| ActivationFactor | The activation factor for this OfferOption. If this attribute is omitted, a default value of 1.00 must be assumed.Notes:The ActivationFactor must be greater than or equal to the MinActivationFactor in the OfferOption chosen from the FlexOffer. |
| ISP | |
| ⇥ Power | Power specified for this ISP in Watts. Also see the important notes about the sign of this attribute in the main documentation entry for the ISP element, section [power](power.md). |
+| ⇥ DefaultBaseline | Capacity (specified in Watts) in the default situation that would occur if no flexibility were activated. |
+| ⇥ Baseline | Capacity baseline (specified in Watts) before this flexibility was requested. If flexibility was activated earlier for this ISP, then this is the capacity with the deviation applied. |
| ⇥ Start | Number of the first ISP this element refers to. The first ISP of a day has number 1. |
| ⇥ Duration | The number of the ISPs this element represents. Optional, default value is 1. |
diff --git a/docs/message-descriptions/message-catalog/flex-request.md b/docs/message-descriptions/message-catalog/flex-request.md
index 9e53a49e..4e543430 100644
--- a/docs/message-descriptions/message-catalog/flex-request.md
+++ b/docs/message-descriptions/message-catalog/flex-request.md
@@ -22,6 +22,8 @@ In addition to one or more ISP elements with Disposition=Requested, indicating t
Disposition = "Available" | "Requested"
MinPower = Integer
MaxPower = Integer
+ DefaultBaseline = Integer (optional)
+ Baseline = Integer (optional)
Start = Integer
Duration = Integer (optional, default = 1)
/>
@@ -41,5 +43,7 @@ In addition to one or more ISP elements with Disposition=Requested, indicating t
| ⇥ Disposition | indication whether the Power specified for this ISP represents available capacity or a request for reduction/increase.At least one ISP should have Disposition = Requested |
| ⇥ MinPower | Lower bound for available/requested space to deviate from the baseline (in Watts).For further explanation, see section [Flexibility trading between the AGR and DSO](../../general-description/validate-phase.md#flexibility-trading-between-the-agr-and-dso). Also see the important notes about the sign of this attribute in the ISP element, section [power](power.md). |
| ⇥ MaxPower | Upper bound for available/requested space to deviate from the baseline (in Watts).For further explanation, see section [Flexibility trading between the AGR and DSO](../../general-description/validate-phase.md#flexibility-trading-between-the-agr-and-dso). Also see the important notes about the sign of this attribute in the ISP element, section [power](power.md). |
+| ⇥ DefaultBaseline | Capacity (specified in Watts) in the default situation that would occur if no flexibility were activated. |
+| ⇥ Baseline | Capacity baseline (specified in Watts) before this flexibility was requested. If flexibility was activated earlier for this ISP, then this is the capacity with the deviation applied. |
| ⇥ Start | Number of the first ISP this element refers to. The first ISP of a day has number 1. |
| ⇥ Duration | The number of the ISPs this element represents. Optional, default value is 1. |
diff --git a/xsd/UFTP-agr-dso.xsd b/xsd/UFTP-agr-dso.xsd
index 7ff1ec96..f002574b 100644
--- a/xsd/UFTP-agr-dso.xsd
+++ b/xsd/UFTP-agr-dso.xsd
@@ -6,7 +6,6 @@ SPDX-FileCopyrightText: 2020-2023 Contributors to the Shapeshifter project
SPDX-License-Identifier: Apache-2.0
-->
-
@@ -203,6 +202,16 @@ SPDX-License-Identifier: Apache-2.0
Power specified for this ISP in Watts. Also see the important notes about the sign of this attribute in the main documentation entry for the ISP element.
+
+
+ Capacity (specified in Watts) in the default situation that would occur if no flexibility were activated.
+
+
+
+
+ Capacity baseline (specified in Watts) before this flexibility was requested. If flexibility was activated earlier for this ISP, then this is the capacity with the deviation applied.
+
+
Number of the first ISPs this element refers to. The first ISP of a day has number 1.
@@ -365,6 +374,11 @@ SPDX-License-Identifier: Apache-2.0
Reference to the concerning bilateral contract, if applicable.
+
+
+ Service type for this order, the service type determines response characteristics such as latency or asset participation type.
+
+
MessageID of the D-Prognosis this request is based on, if it has been agreed that the baseline is based on D-prognoses.
@@ -410,6 +424,16 @@ SPDX-License-Identifier: Apache-2.0
Power specified for this ISP in Watts. Also see the important notes about the sign of this attribute in the main documentation entry for the ISP element.
+
+
+ Capacity (specified in Watts) in the default situation that would occur if no flexibility were activated.
+
+
+
+
+ Capacity baseline (specified in Watts) before this flexibility was requested. If flexibility was activated earlier for this ISP, then this is the capacity with the deviation applied.
+
+
Number of the first ISPs this element refers to. The first ISP of a day has number 1.