diff --git a/Changes.md b/Changes.md
index b30bb04..1e17c7e 100644
--- a/Changes.md
+++ b/Changes.md
@@ -1,34 +1,50 @@
 # Version 2.0
 
 ## 2.X.0
 
-* Made `MatrixElement::tree_kin` and `MatrixElement::tree_param` public
+* Made `MatrixElement.tree_kin(...)` and `MatrixElement.tree_param(...)` public
 * Allow multiplication and division of multiple scale functions e.g.
   `H_T/2*m_j1j2`
 * Follow HepMC convention for particle Status codes: incoming = 11,
   decaying = 2, outgoing = 1 (unchanged)
 * New class `CrossSectionAccumulator` to keep track of Cross Section of the
   different subproccess
-* Removed default constructor for `Event`
+* New template struct `Parameters` similar to old `Weights`
+  - `Weights` are now an alias for `Parameters<double>`. Calling `Weights` did
+    not change
+  - `Weights.hh` was replaced by `Parameters.hh`. The old `Weights.hh` header
+    will be removed in HEJ Version 2.3.0
+* Function to multiplication and division of `EventParameters.weight` by double
+  - This can be combined with `Parameters`, e.g.
+    `Parameters<EventParameters>*Weights`, see also `Events.parameters()`
+  - Moved `EventParameters` to `Parameters.hh` header
+* Restructured `Event` class
+  - `Event` can now only be build from a (new) `Event::EventData` class
+  - Removed default constructor for `Event`
+  - `Event::EventData` replaces the old `UnclusteredEvent` struct.
+  - `UnclusteredEvent` is now deprecated, and will be removed in HEJ Version
+    2.3.0
+  - Added new member function `Events.parameters()`, to directly access
+    (underlying) `Parameters<EventParameters>`
 
 ## 2.0.4
 
 * Fixed wrong path of `HEJ_INCLUDE_DIR` in `hej-config.cmake`
 * Correctly include rivet headers
 * New `EXCLUDE_package` variable in `cmake` to not interface to specific
   packages
 * Consistent search and include for side packages in `cmake`
 
 ## 2.0.3
 
 * Fixed parsing of (numerical factor) * (base scale) in configuration
 * Don't change scale names, but sanitise Rivet output file names instead
 
 ## 2.0.2
 
 * Changed scale names to `"_over_"` and `"_times_"` for proper file names (was
   `"/"` and `"*"` before)
 
 ## 2.0.1
 
 * Fixed name of fixed-order generator in error message.
diff --git a/include/HEJ/Weights.hh b/include/HEJ/Weights.hh
index ca82f1f..3a353aa 100644
--- a/include/HEJ/Weights.hh
+++ b/include/HEJ/Weights.hh
@@ -1,11 +1,12 @@
 /** \file
  *  \brief Legacy Header for Weights
  *  \note  This Header was moved to "HEJ/Parameters.hh"
+ *  \TODO remove in HEJ 2.3.0
  *
  *  \authors   Jeppe Andersen, Tuomas Hapola, Marian Heil, Andreas Maier, Jennifer Smillie
  *  \date      2019
  *  \copyright GPLv2 or later
  */
 #pragma once
 
 #include "HEJ/Parameters.hh"