andreas.fenkart
--- a/src/metering/metering.cpp
+++ b/src/metering/metering.cpp
  return {};
 }

-class MeteringImpl : public MeteringSubsystem {
-private:
-  std::string m_MeteringStorageLocation;
-  MeteringBusInterface* m_pMeteringBusInterface = NULL;
+class MeteringImpl;
+
+class Direction {
+public:
+  typedef std::function<std::string(const dsuid_t&)> createFilename_t;
--- a/src/metering/metering.cpp
+++ b/src/metering/metering.cpp
+  MeteringBusInterface* m_pMeteringBusInterface = NULL;

-  std::vector<std::string> getKnownArchiveFilenames();
-  std::string tryGetValidArchiveFilename(const dsuid_t& dsmId) const;
-  std::string getOrCreateCachedSeries(const dsuid_t& dsmId);
+  std::shared_ptr<Archives> m_archives;
+  Direction m_consumption;
+  Direction m_production;

-  std::optional<ArchiveValue> tryCreateCacheFromDB(const dsuid_t& meterId) const;
+public:
+  // callbacks from Direction
+  std::string createArchiveFilename(const dsuid_t& meterId, DirectionType directionType) const {
+    return (directionType == DirectionType::Consumption)
+               ? ds::str(m_MeteringStorageLocation, meterId, ".rrd")
+               : ds::str(m_MeteringStorageLocation, meterId, "-production.rrd");
--- a/src/metering/metering.cpp
+++ b/src/metering/metering.cpp
  const std::vector<MeteringConfig> getConfig() const override { return m_archives->getConfig(); }
  void setMeteringBusInterface(MeteringBusInterface* _value) override { m_pMeteringBusInterface = _value; }

-  std::string createCachedSeriesFilename(const dsuid_t meterId) const override {
-    return ds::str(m_MeteringStorageLocation, meterId, ".rrd");
+  std::optional<ArchiveValue> getEnergy(const dsuid_t& meterId) const override {
+    return m_consumption.getEnergy(meterId);
+  }
+  std::optional<ArchiveValue> getProducedEnergy(const dsuid_t& meterId) const override {
+    return m_consumption.getEnergy(meterId);
--- a/src/metering/metering.cpp
+++ b/src/metering/metering.cpp
  }
 }

-std::string MeteringImpl::tryGetValidArchiveFilename(const dsuid_t& dsmId) const {
+std::string Direction::tryGetValidArchiveFilename(const dsuid_t& dsmId) const {
  {
    boost::mutex::scoped_lock lock(m_cachedSeries_mutex);
    if (auto it = boost::find(m_consumptionOnly, dsmId); it != m_consumptionOnly.end()) {
--- a/src/metering/metering.cpp
+++ b/src/metering/metering.cpp

-  std::optional<ArchiveValue> getEnergy(const dsuid_t& dsuid) const override;
  std::vector<Value> getSeries(std::vector<boost::shared_ptr<DSMeter>> _meters, int& _resolution,
                               metering::SeriesTypes _type, bool _energyInWh, const TimeDuration& timeDuration,
                               int& _valueCount) override;
 }; // MeteringImpl

+std::string Direction::createArchiveFilename(const dsuid_t& meterId) const {
+  return m_metering->createArchiveFilename(meterId, m_directionType);
+}
+
 MeteringImpl::MeteringImpl(DSS* _pDSS, std::shared_ptr<Archives>&& archives)
-    : MeteringSubsystem(_pDSS), m_archives(std::move(archives)) {}
+    : MeteringSubsystem(_pDSS),
+      m_archives(std::move(archives)),
+      m_consumption(this, DirectionType::Consumption),