diff --git a/xAOD/xAODFaserWaveform/CMakeLists.txt b/xAOD/xAODFaserWaveform/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..1185251139a20ea833a672371173ad00c2987ccd
--- /dev/null
+++ b/xAOD/xAODFaserWaveform/CMakeLists.txt
@@ -0,0 +1,26 @@
+# Copyright (C) 2020 CERN for the benefit of the FASER collaboration
+
+# Declare the package name.
+atlas_subdir( xAODFaserWaveform )
+
+# External dependencies.
+find_package( xAODUtilities )
+
+# Component(s) in the package.
+atlas_add_library( xAODFaserWaveform
+   xAODFaserWaveform/*.h xAODFaserWaveform/versions/*.h Root/*.cxx
+   PUBLIC_HEADERS xAODFaserWaveform
+   LINK_LIBRARIES xAODCore )
+
+atlas_add_xaod_smart_pointer_dicts(
+   INPUT xAODFaserWaveform/selection.xml
+   OUTPUT _selectionFile
+   OBJECTS "xAOD::WaveformClock_v1"
+   CONTAINERS "xAOD::WaveformHitContainer_v1")
+
+atlas_add_dictionary( xAODFaserWaveformDict
+   xAODFaserWaveform/xAODFaserWaveformDict.h
+   ${_selectionFile}
+   LINK_LIBRARIES xAODCore xAODFaserWaveform
+   EXTRA_FILES Root/dict/*.cxx )
+
diff --git a/xAOD/xAODFaserWaveform/Root/WaveformClockAuxInfo_v1.cxx b/xAOD/xAODFaserWaveform/Root/WaveformClockAuxInfo_v1.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..c6be98a7b194d452a6d91bf825d359d276a888cb
--- /dev/null
+++ b/xAOD/xAODFaserWaveform/Root/WaveformClockAuxInfo_v1.cxx
@@ -0,0 +1,18 @@
+/*
+  Copyright (C) 2020 CERN for the benefit of the FASER collaboration
+*/
+
+// Local include(s):
+#include "xAODFaserWaveform/versions/WaveformClockAuxInfo_v1.h"
+
+namespace xAOD {
+
+  WaveformClockAuxInfo_v1::WaveformClockAuxInfo_v1()
+    : AuxInfoBase(), 
+      frequency(0), phase(0), offset(0), amplitude(0) {
+    AUX_VARIABLE( frequency );
+    AUX_VARIABLE( phase );
+    AUX_VARIABLE( offset );
+    AUX_VARIABLE( amplitude );
+  }
+} // namespace xAOD
diff --git a/xAOD/xAODFaserWaveform/Root/WaveformClock_v1.cxx b/xAOD/xAODFaserWaveform/Root/WaveformClock_v1.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..6a3128d028e883fb25d8b17a8fe012b064241828
--- /dev/null
+++ b/xAOD/xAODFaserWaveform/Root/WaveformClock_v1.cxx
@@ -0,0 +1,35 @@
+/*
+  Copyright (C) 2020 CERN for the benefit of the FASER collaboration
+*/
+
+// EDM include(s):
+#include "xAODCore/AuxStoreAccessorMacros.h"
+
+// Local include(s):
+#include "xAODFaserWaveform/versions/WaveformClock_v1.h"
+
+namespace xAOD {
+
+  WaveformClock_v1::WaveformClock_v1() : SG::AuxElement() {
+  }
+
+  AUXSTORE_PRIMITIVE_SETTER_AND_GETTER( WaveformClock_v1, double, frequency, set_frequency )
+
+  AUXSTORE_PRIMITIVE_SETTER_AND_GETTER( WaveformClock_v1, double, phase, set_phase )
+
+  AUXSTORE_PRIMITIVE_SETTER_AND_GETTER( WaveformClock_v1, double, offset, set_offset )
+
+  AUXSTORE_PRIMITIVE_SETTER_AND_GETTER( WaveformClock_v1, double, amplitude, set_amplitude )
+
+} // namespace xAOD
+
+namespace xAOD {
+
+  std::ostream& operator<<(std::ostream& s, const xAOD::WaveformClock_v1& clk) {
+    s << "xAODWaveformClock: frequency=" << clk.frequency()
+      << std::endl;
+
+    return s;
+  }
+
+} // namespace xAOD
diff --git a/xAOD/xAODFaserWaveform/Root/WaveformHitAuxContainer_v1.cxx b/xAOD/xAODFaserWaveform/Root/WaveformHitAuxContainer_v1.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..300fa4d84c253970b86ad6c36b96eabeff89a104
--- /dev/null
+++ b/xAOD/xAODFaserWaveform/Root/WaveformHitAuxContainer_v1.cxx
@@ -0,0 +1,19 @@
+/*
+  Copyright (C) 2020 CERN for the benefit of the FASER collaboration
+*/
+
+// Local include(s):
+#include "xAODFaserWaveform/versions/WaveformHitAuxContainer_v1.h"
+
+namespace xAOD {
+
+  WaveformHitAuxContainer_v1::WaveformHitAuxContainer_v1() 
+    : AuxContainerBase() {
+
+    AUX_VARIABLE(baseline_mean);
+    AUX_VARIABLE(baseline_rms);
+
+  }
+
+} // namespace xAOD
+
diff --git a/xAOD/xAODFaserWaveform/Root/WaveformHit_v1.cxx b/xAOD/xAODFaserWaveform/Root/WaveformHit_v1.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..080946b0ef70f0de09e5c13a49aef32ebc2e36d3
--- /dev/null
+++ b/xAOD/xAODFaserWaveform/Root/WaveformHit_v1.cxx
@@ -0,0 +1,32 @@
+/*
+  Copyright (C) 2020 CERN for the benefit of the FASER collaboration
+*/
+
+// EDM include(s):
+#include "xAODCore/AuxStoreAccessorMacros.h"
+
+// Local include(s):
+#include "xAODFaserWaveform/versions/WaveformHit_v1.h"
+
+namespace xAOD {
+
+  WaveformHit_v1::WaveformHit_v1() : SG::AuxElement() {
+  }
+
+  AUXSTORE_PRIMITIVE_SETTER_AND_GETTER( WaveformHit_v1, float, baseline_mean, set_baseline_mean )
+
+  AUXSTORE_PRIMITIVE_SETTER_AND_GETTER( WaveformHit_v1, float, baseline_rms, set_baseline_rms )
+
+} // namespace xAOD
+
+namespace xAOD {
+
+  std::ostream& operator<<(std::ostream& s, const xAOD::WaveformHit_v1& hit) {
+    s << "xAODWaveformHit: baseline=" << hit.baseline_mean() 
+      << " rms=" << hit.baseline_rms()
+      << std::endl;
+
+    return s;
+  }
+
+} // namespace xAOD
diff --git a/xAOD/xAODFaserWaveform/Root/xAODFaserWaveformCLIDs.cxx b/xAOD/xAODFaserWaveform/Root/xAODFaserWaveformCLIDs.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..acd57bce0d941b16c815e9805b7da8e76bf2ef27
--- /dev/null
+++ b/xAOD/xAODFaserWaveform/Root/xAODFaserWaveformCLIDs.cxx
@@ -0,0 +1,10 @@
+/*
+  Copyright (C) 2020 CERN for the benefit of the FASER collaboration
+*/
+
+//simple includes to force the CLASS_DEF etc to be encountered during compile
+
+#include "xAODFaserWaveform/WaveformHitContainer.h"
+#include "xAODFaserWaveform/WaveformHitAuxContainer.h"
+#include "xAODFaserWaveform/WaveformClock.h"
+#include "xAODFaserWaveform/WaveformClockAuxInfo.h"
diff --git a/xAOD/xAODFaserWaveform/xAODFaserWaveform/WaveformClock.h b/xAOD/xAODFaserWaveform/xAODFaserWaveform/WaveformClock.h
new file mode 100644
index 0000000000000000000000000000000000000000..951d21a7a706e01c11b642490e4d71f7d019a8af
--- /dev/null
+++ b/xAOD/xAODFaserWaveform/xAODFaserWaveform/WaveformClock.h
@@ -0,0 +1,22 @@
+// Dear emacs, this is -*- c++ -*-
+
+/*
+  Copyright (C) 2020 CERN for the benefit of the FASER collaboration
+*/
+
+#ifndef XAODFASERWAVEFORM_WAVEFORMCLOCK_H
+#define XAODFASERWAVEFORM_WAVEFORMCLOCK_H
+
+// Local include(s):
+#include "xAODFaserWaveform/versions/WaveformClock_v1.h"
+
+namespace xAOD {
+  /// Declare the latest version of the class
+  typedef WaveformClock_v1 WaveformClock;
+}
+
+// Set up a CLID for the container:
+#include "xAODCore/CLASS_DEF.h"
+CLASS_DEF( xAOD::WaveformClock, 58376762, 1 )
+
+#endif // XAODFASERWAVEFORM_WAVEFORMCLOCK_H
diff --git a/xAOD/xAODFaserWaveform/xAODFaserWaveform/WaveformClockAuxInfo.h b/xAOD/xAODFaserWaveform/xAODFaserWaveform/WaveformClockAuxInfo.h
new file mode 100644
index 0000000000000000000000000000000000000000..5cdc5294f041b7370ca745e09dfe55223b47b3f9
--- /dev/null
+++ b/xAOD/xAODFaserWaveform/xAODFaserWaveform/WaveformClockAuxInfo.h
@@ -0,0 +1,22 @@
+// Dear emacs, this is -*- c++ -*-
+
+/*
+  Copyright (C) 2020 CERN for the benefit of the FASER collaboration
+*/
+
+#ifndef XAODFASERWAVEFORM_WAVEFORMCLOCKAUXINFO_H
+#define XAODFASERWAVEFORM_WAVEFORMCLOCKAUXINFO_H
+
+// Local include(s):
+#include "xAODFaserWaveform/versions/WaveformClockAuxInfo_v1.h"
+
+namespace xAOD {
+  /// Declare the latest version of the class
+  typedef WaveformClockAuxInfo_v1 WaveformClockAuxInfo;
+}
+
+// Set up a CLID for the container:
+#include "xAODCore/CLASS_DEF.h"
+CLASS_DEF( xAOD::WaveformClockAuxInfo, 150155999, 1 )
+
+#endif // XAODFASERWAVEFORM_WAVEFORMCLOCKAUXINFO_H
diff --git a/xAOD/xAODFaserWaveform/xAODFaserWaveform/WaveformHit.h b/xAOD/xAODFaserWaveform/xAODFaserWaveform/WaveformHit.h
new file mode 100644
index 0000000000000000000000000000000000000000..6f01f4fc47ca8e213dbd8634ea7444b5db0270b1
--- /dev/null
+++ b/xAOD/xAODFaserWaveform/xAODFaserWaveform/WaveformHit.h
@@ -0,0 +1,22 @@
+// Dear emacs, this is -*- c++ -*-
+
+/*
+  Copyright (C) 2020 CERN for the benefit of the FASER collaboration
+*/
+
+#ifndef XAODFASERWAVEFORM_WAVEFORMHIT_H
+#define XAODFASERWAVEFORM_WAVEFORMHIT_H
+
+// Local include(s):
+#include "xAODFaserWaveform/versions/WaveformHit_v1.h"
+
+namespace xAOD {
+  /// Declare the latest version of the class
+  typedef WaveformHit_v1 WaveformHit;
+}
+
+// Set up a CLID for the container:
+#include "xAODCore/CLASS_DEF.h"
+CLASS_DEF( xAOD::WaveformHit, 131600577, 1 )
+
+#endif // XAODFASERWAVEFORM_WAVEFORMHIT_H
diff --git a/xAOD/xAODFaserWaveform/xAODFaserWaveform/WaveformHitAuxContainer.h b/xAOD/xAODFaserWaveform/xAODFaserWaveform/WaveformHitAuxContainer.h
new file mode 100644
index 0000000000000000000000000000000000000000..014da4c02d3c80f2f2068f5994579deb33ecf056
--- /dev/null
+++ b/xAOD/xAODFaserWaveform/xAODFaserWaveform/WaveformHitAuxContainer.h
@@ -0,0 +1,22 @@
+// Dear emacs, this is -*- c++ -*-
+
+/*
+  Copyright (C) 2020 CERN for the benefit of the FASER collaboration
+*/
+
+#ifndef XAODFASERWAVEFORM_WAVEFORMHITAUXCONTAINER_H
+#define XAODFASERWAVEFORM_WAVEFORMHITAUXCONTAINER_H
+
+// Local include(s):
+#include "xAODFaserWaveform/versions/WaveformHitAuxContainer_v1.h"
+
+namespace xAOD {
+  /// Declare the latest version of the class
+  typedef WaveformHitAuxContainer_v1 WaveformHitAuxContainer;
+}
+
+// Set up a CLID for the container:
+#include "xAODCore/CLASS_DEF.h"
+CLASS_DEF( xAOD::WaveformHitAuxContainer, 1262669778, 1 )
+
+#endif // XAODFASERWAVEFORM_WAVEFORMHITAUXCONTAINER_H
diff --git a/xAOD/xAODFaserWaveform/xAODFaserWaveform/WaveformHitContainer.h b/xAOD/xAODFaserWaveform/xAODFaserWaveform/WaveformHitContainer.h
new file mode 100644
index 0000000000000000000000000000000000000000..41de79d21d8fa88389710a9dbef214653bc6edf1
--- /dev/null
+++ b/xAOD/xAODFaserWaveform/xAODFaserWaveform/WaveformHitContainer.h
@@ -0,0 +1,22 @@
+// Dear emacs, this is -*- c++ -*-
+
+/*
+  Copyright (C) 2020 CERN for the benefit of the FASER collaboration
+*/
+
+#ifndef XAODFASERWAVEFORM_WAVEFORMHITCONTAINER_H
+#define XAODFASERWAVEFORM_WAVEFORMHITCONTAINER_H
+
+// Local include(s):
+#include "xAODFaserWaveform/versions/WaveformHitContainer_v1.h"
+
+namespace xAOD {
+  /// Declare the latest version of the class
+  typedef WaveformHitContainer_v1 WaveformHitContainer;
+}
+
+// Set up a CLID for the container:
+#include "xAODCore/CLASS_DEF.h"
+CLASS_DEF( xAOD::WaveformHitContainer, 1156844391, 1 )
+
+#endif // XAODFASERWAVEFORM_WAVEFORMHITCONTAINER_H
diff --git a/xAOD/xAODFaserWaveform/xAODFaserWaveform/selection.xml b/xAOD/xAODFaserWaveform/xAODFaserWaveform/selection.xml
new file mode 100644
index 0000000000000000000000000000000000000000..44146cd55fad3798ba00f365c671949e36e38423
--- /dev/null
+++ b/xAOD/xAODFaserWaveform/xAODFaserWaveform/selection.xml
@@ -0,0 +1,24 @@
+<!-- Copyright (C) 2020 CERN for the benefit of the FASER collaboration -->
+<lcgdict>
+
+  <class name="xAOD::WaveformHit_v1" />
+  <typedef name="xAOD::WaveformHit" />
+
+  <class name="xAOD::WaveformHitContainer_v1" 
+	 id="fb49e082-7130-462f-9500-de9a2aef8a24" />
+  <typedef name="xAOD::WaveformHitContainer" />
+
+  <class name="xAOD::WaveformHitAuxContainer_v1" 
+	 id="091007bd-f4ab-4862-b905-1a0ed96c962f" />
+  <typedef name="xAOD::WaveformHitAuxContainer" />
+
+  <class name="xAOD::WaveformClock_v1" 
+	 id="461aa5ca-6c72-46ee-b5d5-5bd6df4e2848" />
+  <typedef name="xAOD::WaveformClock" />
+
+  <class name="xAOD::WaveformClockAuxInfo_v1" 
+	 id="fe0600cc-f2f3-4be5-9723-257646dbb8f7" />
+  <typedef name="xAOD::WaveformClockAuxInfo" />
+
+
+</lcgdict>
diff --git a/xAOD/xAODFaserWaveform/xAODFaserWaveform/versions/WaveformClockAuxInfo_v1.h b/xAOD/xAODFaserWaveform/xAODFaserWaveform/versions/WaveformClockAuxInfo_v1.h
new file mode 100644
index 0000000000000000000000000000000000000000..74a98b62e7d3889a52c08f4b916d8970cc754867
--- /dev/null
+++ b/xAOD/xAODFaserWaveform/xAODFaserWaveform/versions/WaveformClockAuxInfo_v1.h
@@ -0,0 +1,45 @@
+// Dear emacs, this is -*- c++ -*- 
+
+/* 
+  Copyright (C) 2020 CERN for the benefit of the FASER collaboration
+*/
+
+#ifndef XAODFASERWAVEFORM_VERSIONS_WAVEFORMCLOCKAUXINFO_V1_H
+#define XAODFASERWAVEFORM_VERSIONS_WAVEFORMCLOCKAUXINFO_V1_H
+
+// System include(s):
+extern "C" {
+#   include "stdint.h"
+}
+
+// xAOD include(s):
+#include "xAODCore/AuxInfoBase.h"
+
+namespace xAOD {
+
+  /// Class holding the data handled by WaveformClock_v1
+
+  class WaveformClockAuxInfo_v1 : public AuxInfoBase {
+
+  public:
+    /// Default constructor
+    WaveformClockAuxInfo_v1();
+
+  private:
+    /// @name Basic variables
+    ///@ {
+    double frequency;
+    double phase;
+    double offset;
+    double amplitude;
+    ///@}
+
+  }; // class WaveformClockAuxInfo_v1
+
+} // namespace xAOD
+
+// Set up a CLID and StoreGate inheritance for the class:
+#include "xAODCore/BaseInfo.h"
+SG_BASE( xAOD::WaveformClockAuxInfo_v1, xAOD::AuxInfoBase );
+
+#endif // XAODFASERWAVEFORM_VERSIONS_WAVEFORMCLOCKAUXINFO_V1_H
diff --git a/xAOD/xAODFaserWaveform/xAODFaserWaveform/versions/WaveformClock_v1.h b/xAOD/xAODFaserWaveform/xAODFaserWaveform/versions/WaveformClock_v1.h
new file mode 100644
index 0000000000000000000000000000000000000000..2d70b976d01ed425da8fa33c50ec04370a6e67e0
--- /dev/null
+++ b/xAOD/xAODFaserWaveform/xAODFaserWaveform/versions/WaveformClock_v1.h
@@ -0,0 +1,55 @@
+// Dear emacs, this is -*- c++ -*-
+
+/*
+  Copyright (C) 2020 CERN for the benefit of the FASER collaboration
+*/
+
+#ifndef XAODFASERWAVEFORM_VERSIONS_WAVEFORMCLOCK_V1_H
+#define XAODFASERWAVEFORM_VERSIONS_WAVEFORMCLOCK_V1_H
+
+// System include(s):
+extern "C" {
+#   include "stdint.h"
+}
+
+// Core EDM include(s):
+#include "AthContainers/AuxElement.h"
+
+namespace xAOD {
+
+  // Cllss describing pulses in the waveform digitizer
+  class WaveformClock_v1 : public SG::AuxElement {
+
+  public:
+    /// Defaullt constructor
+    WaveformClock_v1();
+
+    /// @name Access WaveformClock elements
+    /// @{
+
+    /// Clock Frequency (in MHz)
+    double frequency() const;
+    void set_frequency(double value);
+
+    /// Clock Phase (in Radians)
+    double phase() const;
+    void set_phase(double value);
+
+    /// DC Clock offset
+    double offset() const;
+    void set_offset(double value);
+
+    /// Amplitude of primary freq. component
+    double amplitude() const;
+    void set_amplitude(double value);
+    /// @}
+
+  }; // class WaveformClock_v1
+
+}
+
+// Declare the inheritance of the type:
+#include "xAODCore/BaseInfo.h"
+SG_BASE( xAOD::WaveformClock_v1, SG::AuxElement );
+
+#endif // XAODFASERWAVEFORM_VERSIONS_WAVEFORMCLOCK_V1_H
diff --git a/xAOD/xAODFaserWaveform/xAODFaserWaveform/versions/WaveformHitAuxContainer_v1.h b/xAOD/xAODFaserWaveform/xAODFaserWaveform/versions/WaveformHitAuxContainer_v1.h
new file mode 100644
index 0000000000000000000000000000000000000000..d4a28ac5f9e0babeb2d806778a43c2590a2d0dcb
--- /dev/null
+++ b/xAOD/xAODFaserWaveform/xAODFaserWaveform/versions/WaveformHitAuxContainer_v1.h
@@ -0,0 +1,43 @@
+// Dear emacs, this is -*- c++ -*-                                              
+
+/*                                                                              
+  Copyright (C) 2020 CERN for the benefit of the FASER collaboration            
+*/
+
+#ifndef XAODFASERWAVEFORM_VERSIONS_WAVEFORMHITAUXCONTAINER_V1_H
+#define XAODFASERWAVEFORM_VERSIONS_WAVEFORMHITAUXCONTAINER_V1_H
+
+// STL include(s):
+#include <vector>
+
+// EDM include(s):
+#include "xAODCore/AuxContainerBase.h"
+
+namespace xAOD {
+
+  /// Auxiliary container for WaveformHit containers
+
+  class WaveformHitAuxContainer_v1 : public AuxContainerBase {
+
+  public:
+    /// Default constructor
+    WaveformHitAuxContainer_v1();
+    /// Destructor
+    ~WaveformHitAuxContainer_v1() {}
+
+  private:
+    /// @name Basic variables
+    ///@ {
+    std::vector<float> baseline_mean;
+    std::vector<float> baseline_rms;
+    ///@}
+
+  }; // class WaveformHitAuxContainer_v1
+
+} // namespace xAOD
+
+// Set up a CLID and StoreGate inheritance for the class:
+#include "xAODCore/BaseInfo.h"
+SG_BASE( xAOD::WaveformHitAuxContainer_v1, xAOD::AuxContainerBase );
+
+#endif // XAODFASERWAVEFORM_VERSIONS_WAVEFORMHITAUXCONTAINER_V1_H
diff --git a/xAOD/xAODFaserWaveform/xAODFaserWaveform/versions/WaveformHitContainer_v1.h b/xAOD/xAODFaserWaveform/xAODFaserWaveform/versions/WaveformHitContainer_v1.h
new file mode 100644
index 0000000000000000000000000000000000000000..180cf9719cacaded61292aa67d401d38472016cd
--- /dev/null
+++ b/xAOD/xAODFaserWaveform/xAODFaserWaveform/versions/WaveformHitContainer_v1.h
@@ -0,0 +1,26 @@
+// Dear emacs, this is -*- c++ -*-
+
+/*
+  Copyright (C) 2020 CERN for the benefit of the FASER collaboration
+*/
+
+#ifndef XAODFASERWAVEFORM_VERSIONS_WAVEFORMHITCONTAINER_V1_H
+#define XAODFASERWAVEFORM_VERSIONS_WAVEFORMHITCONTAINER_V1_H
+
+// System include(s):
+extern "C" {
+#   include "stdint.h"
+}
+
+// EDM include(s):
+#include "AthContainers/DataVector.h"
+
+// Local includes:
+#include "xAODFaserWaveform/versions/WaveformHit_v1.h"
+
+namespace xAOD {
+  // Define the container as a simple DataVector
+  typedef DataVector<WaveformHit_v1> WaveformHitContainer_v1;
+}
+
+#endif // XAODFASERWAVEFORM_VERSIONS_WAVEFORMHITCONTAINER_V1_H
diff --git a/xAOD/xAODFaserWaveform/xAODFaserWaveform/versions/WaveformHit_v1.h b/xAOD/xAODFaserWaveform/xAODFaserWaveform/versions/WaveformHit_v1.h
new file mode 100644
index 0000000000000000000000000000000000000000..355b5685b37a07f71d4cac24454cc34a7db7c28f
--- /dev/null
+++ b/xAOD/xAODFaserWaveform/xAODFaserWaveform/versions/WaveformHit_v1.h
@@ -0,0 +1,47 @@
+// Dear emacs, this is -*- c++ -*-
+
+/*
+  Copyright (C) 2020 CERN for the benefit of the FASER collaboration
+*/
+
+#ifndef XAODFASERWAVEFORM_VERSIONS_WAVEFORMHIT_V1_H
+#define XAODFASERWAVEFORM_VERSIONS_WAVEFORMHIT_V1_H
+
+// System include(s):
+extern "C" {
+#   include "stdint.h"
+}
+
+// Core EDM include(s):
+#include "AthContainers/AuxElement.h"
+
+namespace xAOD {
+
+  // Cllss describing pulses in the waveform digitizer
+  class WaveformHit_v1 : public SG::AuxElement {
+
+  public:
+    /// Defaullt constructor
+    WaveformHit_v1();
+
+    /// @name Access WaveformHit elements
+    /// @{
+
+    /// Bsaeline mean
+    float baseline_mean() const;
+    void set_baseline_mean(float value);
+
+    /// Baseline rms
+    float baseline_rms() const;
+    void set_baseline_rms(float value);
+
+  }; // class WaveformHit_v1
+
+}
+
+// Declare the inheritance of the type:
+#include "xAODCore/BaseInfo.h"
+SG_BASE( xAOD::WaveformHit_v1, SG::AuxElement );
+
+
+#endif // XAODFASERWAVEFORM_VERSIONS_WAVEFORMHIT_V1_H
diff --git a/xAOD/xAODFaserWaveform/xAODFaserWaveform/xAODFaserWaveformDict.h b/xAOD/xAODFaserWaveform/xAODFaserWaveform/xAODFaserWaveformDict.h
new file mode 100644
index 0000000000000000000000000000000000000000..6ba4a1abdd1ecc915ad09292a8c0e975136a778e
--- /dev/null
+++ b/xAOD/xAODFaserWaveform/xAODFaserWaveform/xAODFaserWaveformDict.h
@@ -0,0 +1,33 @@
+/*
+  Copyright (C) 2020 CERN for the benefit of the FASER collaboration
+*/
+
+#ifndef XAODFASERWAVEFORM_XAODFASERWAVEFORMDICT_H
+#define XAODFASERWAVEFORM_XAODFASERWAVEFORMDICT_H
+
+// Local includes
+#include "xAODFaserWaveform/WaveformHit.h"
+#include "xAODFaserWaveform/WaveformHitContainer.h"
+#include "xAODFaserWaveform/WaveformHitAuxContainer.h"
+
+#include "xAODFaserWaveform/WaveformClock.h"
+#include "xAODFaserWaveform/WaveformClockAuxInfo.h"
+
+#include "xAODFaserWaveform/versions/WaveformHit_v1.h"
+#include "xAODFaserWaveform/versions/WaveformHitContainer_v1.h"
+#include "xAODFaserWaveform/versions/WaveformHitAuxContainer_v1.h"
+
+#include "xAODFaserWaveform/versions/WaveformClock_v1.h"
+#include "xAODFaserWaveform/versions/WaveformClockAuxInfo_v1.h"
+
+// EDM include(s).
+#include "xAODCore/tools/DictHelpers.h"
+
+namespace {
+  struct GCCXML_DUMMY_INSTANTIATION_XAODFASERWAVEFORM {
+    XAOD_INSTANTIATE_NS_CONTAINER_TYPES( xAOD, WaveformHitContainer_v1 );
+    XAOD_INSTANTIATE_NS_OBJECT_TYPES( xAOD, WaveformClock_v1 );
+  }
+}
+
+#endif // XAODFASERWAVEFORM_XAODFASERWAVEFORMDICT_H