diff --git a/.gitignore b/.gitignore
index 48689f16c..fcda03d1a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 *~
 /ebusd-configuration-*.deb
 /ebusd-configuration-*.tgz
+.DS_Store
diff --git a/ebusd-2.1.x/de/vaillant/15.emm.csv b/ebusd-2.1.x/de/vaillant/15.emm.csv
new file mode 100644
index 000000000..5765ccfbe
--- /dev/null
+++ b/ebusd-2.1.x/de/vaillant/15.emm.csv
@@ -0,0 +1,99 @@
+# type (r[1-9];w;u),circuit,name,[comment],[QQ],ZZ,PBSB,[ID],field1,part (m/s),datatypes/templates,divider/values,unit,comment,field2,part (m/s),datatypes/templates,divider/values,unit,comment,field3,part (m/s),datatypes/templates,divider/values,unit,comment,field4,part (m/s),datatypes/templates,divider/values,unit,comment
+#,EMM00,sensoDIREKT VRC710,,,,,,,,,,,
+
+*[SW],scan,,,SW,,,,,,,,,
+
+*r,,,,,08,"B524","02000000",,,IGN:4,,,
+*w,,,,,08,"B524","02010000",,,,,,
+r,,SpecOpModeOff,Sonderbetriebsart Anlage aus,,,,"0700",,,UCH,00=Anlage EIN;01=Anlage AUS,,
+r,,SpecOpModeAbsentZone1Temp,Sonderbetriebsart Abwesenheit Zone 1 Temperatur,,,,"F600",,,IGN:4,,,,,,tempv,,,
+r;w,,Date,Datum,,,,"3400",,,HDA:3,,,
+r,,Time,Zeit,,,,"3500",,,HTI,,,
+r,,WaterPressure,Wasserdruck,,,,3900,,,pressv,,,Wasserdruck
+r,,OutsideTemp,Außentemperatur,,,,"7300",,,tempv,,,
+
+*r,,,,,08,"B524","02000100",,,IGN:4,,,
+r,,OpModeHotWater,Betriebsart Warmwasser,,,,"0300",,,UIN,00=AUS;01=AUTOMATIK;2=MANUELL,,
+r,,DesiredTempHW,Warmwassersolltemperatur,,,,"0400",,,tempv,,,
+r,,StorageTempHW,Speicheristtemperatur,,,,0500,,,tempv,,,Speicheristtemperatur
+r,,SpecOpModeAbsentHWStart,Sonderbetriebsart Abwesenheit Warmwasser Start,,,,"0900",,,HDA:3,,,
+r,,SpecOpModeAbsentHWEnd,Sonderbetriebsart Abwesenheit Warmwasser Ende,,,,"0a00",,,HDA:3,,,
+r,,SpecOpModeHWFast,Sonderbetriebsart Warmwasser schnell,,,,"0d00",,,UCH,06=EIN;00=AUS,,
+r,,SpecOpModeAbsentHW.1,Sonderbetriebsart Abwesenheit Warmwasser,,,,"1000",,,U3R,,,
+r,,SpecOpModeAbsentHW.2,Sonderbetriebsart Abwesenheit Warmwasser,,,,"1100",,,U3R,,,
+
+*r,,,,,08,"B524","02000300",,,IGN:4,,,
+r,,SpecOpModeAbsentZone1Start,Sonderbetriebsart Abwesenheit Zone 1 Start,,,,"0300",,,HDA:3,,,
+r,,SpecOpModeAbsentZone1End,Sonderbetriebsart Abwesenheit Zone 1 Ende,,,,"0400",,,HDA:3,,,
+r,,OpModeZone1,Betriebsart Zone 1,,,,"0600",,,UIN,00=AUS;01=AUTOMATIK;2=MANUELL,,
+r,,TemporaryDesiredTempZone1,Temporäre Solltemperatur Zone 1,,,,"0800",,,tempv,,,
+r,,ReducedTempZone1,Reduzierte Temperatur Zone 1,,,,"0900",,,tempv,,,
+r,,SpecOpModeShockVent,Sonderbetriebsart Stoßlüften,,,,"0e00",,,UCH,01=EIN;00=AUS,,
+r,,DesiredTempZone1,Solltemperatur Zone 1,,,,"1400",,,tempv,,,
+r,,NameZone1.1,Name Zone 1.1,,,,"1700",,,STR:5,,,
+r,,NameZone1.2,Name Zone 1.2,,,,"1800",,,STR:5,,,
+r,,TemporaryDesiredTempZone1EndTime,Temporäre Solltemperatur Ende Uhrzeit,,,,"1E00",,,HTI,,,
+r,,SpecOpModeAbsentZone1.1,Sonderbetriebsart Abwesenheit Zone 1,,,,"2000",,,U3R,,,
+r,,SpecOpModeAbsentZone1.2,Sonderbetriebsart Abwesenheit Zone 1,,,,"2100",,,U3R,,,
+r,,ManDesiredTempZone1,Manuelle Solltemperatur Zone 1,,,,"2200",,,tempv,,,
+r,,TemporaryDesiredTempZone1EndDate,Temporäre Solltemperatur Ende Datum,,,,"2400",,,HDA:3,,,
+r,,DurTemporaryDesiredTempZone1,Dauer Temporäre Solltemperatur Zone 1,,,,"2600",,,SLG,,,
+
+*r,,,,,08,"B555",,,,,,,
+r,,TimerZone1.NumSlots,Zone 1 Anzahl Zeitfenster,,,,"A40000",,,slotCountWeek,,,,
+r,,TimerHW.NumSlots,Warmwasser Anzahl Zeitfenster,,,,"A40002",,,slotCountWeek,,,,
+r,,TimerWP.NumSlots,Zirkulationspumpe Anzahl Zeitfenster,,,,"A40003",,,slotCountWeek,,,,
+*r,,,,,08,"B555",A50000,,,rTimeSlotWithTemp,,,
+r,,TimerZone1.Monday.1,Zone 1 Zeitfenster 1 Montag,,,,"0000",,,,,,,
+r,,TimerZone1.Monday.2,Zone 1 Zeitfenster 2 Montag,,,,"0001",,,,,,,
+r,,TimerZone1.Tuesday.1,Zone 1 Zeitfenster 1 Dienstag,,,,"0100",,,,,,,
+r,,TimerZone1.Tuesday.2,Zone 1 Zeitfenster 2 Dienstag,,,,"0101",,,,,,,
+r,,TimerZone1.Wednesday.1,Zone 1 Zeitfenster 1 Mittwoch,,,,"0200",,,,,,,
+r,,TimerZone1.Wednesday.2,Zone 1 Zeitfenster 2 Mittwoch,,,,"0201",,,,,,,
+r,,TimerZone1.Thursday.1,Zone 1 Zeitfenster 1 Donnerstag,,,,"0300",,,,,,,
+r,,TimerZone1.Thursday.2,Zone 1 Zeitfenster 2 Donnerstag,,,,"0301",,,,,,,
+r,,TimerZone1.Friday.1,Zone 1 Zeitfenster 1 Freitag,,,,"0400",,,,,,,
+r,,TimerZone1.Friday.2,Zone 1 Zeitfenster 2 Freitag,,,,"0401",,,,,,,
+r,,TimerZone1.Saturday.1,Zone 1 Zeitfenster 1 Samstag,,,,"0500",,,,,,,
+r,,TimerZone1.Saturday.2,Zone 1 Zeitfenster 2 Samstag,,,,"0501",,,,,,,
+r,,TimerZone1.Sunday.1,Zone 1 Zeitfenster 1 Sonntag,,,,"0600",,,,,,,
+r,,TimerZone1.Sunday.2,Zone 1 Zeitfenster 2 Sonntag,,,,"0601",,,,,,,
+*r,,,,,08,"B555",A50002,,,rTimeSlotWithTemp,,,
+r,,TimerHW.Monday.1,Warmwasser Zeitfenster 1 Montag,,,,"0000",,,,,,,
+r,,TimerHW.Monday.2,Warmwasser Zeitfenster 2 Montag,,,,"0001",,,,,,,
+r,,TimerHW.Tuesday.1,Warmwasser Zeitfenster 1 Dienstag,,,,"0100",,,,,,,
+r,,TimerHW.Tuesday.2,Warmwasser Zeitfenster 2 Dienstag,,,,"0101",,,,,,,
+r,,TimerHW.Wednesday.1,Warmwasser Zeitfenster 1 Mittwoch,,,,"0200",,,,,,,
+r,,TimerHW.Wednesday.2,Warmwasser Zeitfenster 2 Mittwoch,,,,"0201",,,,,,,
+r,,TimerHW.Thursday.1,Warmwasser Zeitfenster 1 Donnerstag,,,,"0300",,,,,,,
+r,,TimerHW.Thursday.2,Warmwasser Zeitfenster 2 Donnerstag,,,,"0301",,,,,,,
+r,,TimerHW.Friday.1,Warmwasser Zeitfenster 1 Freitag,,,,"0400",,,,,,,
+r,,TimerHW.Friday.2,Warmwasser Zeitfenster 2 Freitag,,,,"0401",,,,,,,
+r,,TimerHW.Saturday.1,Warmwasser Zeitfenster 1 Samstag,,,,"0500",,,,,,,
+r,,TimerHW.Saturday.2,Warmwasser Zeitfenster 2 Samstag,,,,"0501",,,,,,,
+r,,TimerHW.Sunday.1,Warmwasser Zeitfenster 1 Sonntag,,,,"0600",,,,,,,
+r,,TimerHW.Sunday.2,Warmwasser Zeitfenster 2 Sonntag,,,,"0601",,,,,,,
+*r,,,,,08,"B555",A50003,,,rTimeSlotWithoutTemp,,,
+r,,TimerWP.Monday.1,Zirkulationspumpe Zeitfenster 1 Montag,,,,"0000",,,,,,,
+r,,TimerWP.Monday.2,Zirkulationspumpe Zeitfenster 2 Montag,,,,"0001",,,,,,,
+r,,TimerWP.Tuesday.1,Zirkulationspumpe Zeitfenster 1 Dienstag,,,,"0100",,,,,,,
+r,,TimerWP.Tuesday.2,Zirkulationspumpe Zeitfenster 2 Dienstag,,,,"0101",,,,,,,
+r,,TimerWP.Wednesday.1,Zirkulationspumpe Zeitfenster 1 Mittwoch,,,,"0200",,,,,,,
+r,,TimerWP.Wednesday.2,Zirkulationspumpe Zeitfenster 2 Mittwoch,,,,"0201",,,,,,,
+r,,TimerWP.Thursday.1,Zirkulationspumpe Zeitfenster 1 Donnerstag,,,,"0300",,,,,,,
+r,,TimerWP.Thursday.2,Zirkulationspumpe Zeitfenster 2 Donnerstag,,,,"0301",,,,,,,
+r,,TimerWP.Friday.1,Zirkulationspumpe Zeitfenster 1 Freitag,,,,"0400",,,,,,,
+r,,TimerWP.Friday.2,Zirkulationspumpe Zeitfenster 2 Freitag,,,,"0401",,,,,,,
+r,,TimerWP.Saturday.1,Zirkulationspumpe Zeitfenster 1 Samstag,,,,"0500",,,,,,,
+r,,TimerWP.Saturday.2,Zirkulationspumpe Zeitfenster 2 Samstag,,,,"0501",,,,,,,
+r,,TimerWP.Sunday.1,Zirkulationspumpe Zeitfenster 1 Sonntag,,,,"0600",,,,,,,
+r,,TimerWP.Sunday.2,Zirkulationspumpe Zeitfenster 2 Sonntag,,,,"0601",,,,,,,
+
+*r,,,,,08,"B516",1000ffff,,,,,,
+r,,ConsumedPrimaryEnergyHeating,Gasverbrauch Heizung,,,,"84030000",,,IGN:7,,,,,,ULG,,Wh, Bedeutung des Absolutwertes unklar; Die Differenz zweier Werte entspricht ca. 0.125 Wh in dem Zeitraum
+r,,ConsumedElectricalEnergyHeating,Verbrauch elektrischer Energie Heizung,,,,"83030000",,,IGN:7,,,,,,ULG,,Wh, Bedeutung des Absolutwertes unklar; Die Differenz zweier Werte entspricht ca. 0.00185 Wh in dem Zeitraum
+r,,HeatGeneratedHeating,Erzeugte Wärme Heizung,,,,"49030000",,,IGN:7,,,,,,ULG,,Wh, Bedeutung des Absolutwertes unklar; Die Differenz zweier Werte entspricht ca. 0.125 Wh in dem Zeitraum
+r,,ConsumedPrimaryEnergyHW,Gasverbrauch Warmwasser,,,,"84040000",,,IGN:7,,,,,,ULG,,Wh, Bedeutung des Absolutwertes unklar; Die Differenz zweier Werte entspricht ca. 0.125 Wh in dem Zeitraum
+r,,ConsumedElectricalEnergyHW,Verbrauch elektrischer Energie Warmwasser,,,,"83040000",,,IGN:7,,,,,,ULG,,Wh, Bedeutung des Absolutwertes unklar; Die Differenz zweier Werte entspricht ca. 0.0005 Wh in dem Zeitraum
+r,,HeatGeneratedHW,Erzeugte Wärme Warmwasser,,,,"49040000",,,IGN:7,,,,,,ULG,,Wh, Bedeutung des Absolutwertes unklar; Die Differenz zweier Werte entspricht ca. 0.0625 Wh in dem Zeitraum
+!include,15.emm.unknown.inc
diff --git a/ebusd-2.1.x/de/vaillant/15.emm.unknown.inc b/ebusd-2.1.x/de/vaillant/15.emm.unknown.inc
new file mode 100644
index 000000000..60d883bc0
--- /dev/null
+++ b/ebusd-2.1.x/de/vaillant/15.emm.unknown.inc
@@ -0,0 +1,118 @@
+# type (r[1-9];w;u),circuit,name,[comment],[QQ],ZZ,PBSB,[ID],field1,part (m/s),datatypes/templates,divider/values,unit,comment,field2,part (m/s),datatypes/templates,divider/values,unit,comment,field3,part (m/s),datatypes/templates,divider/values,unit,comment,field4,part (m/s),datatypes/templates,divider/values,unit,comment
+*r,emm,,,,08,"B524","02000000"
+r,,Unknown35,,,,,"0100"
+r,,Unknown36,,,,,"0200"
+r,,Unknown1,,,,,"0400"
+r,,Unknown2,,,,,"0A00"
+r,,Unknown37,,,,,"0F00"
+r,,Unknown38,,,,,"1300"
+r,,Unknown39,,,,,"1400"
+r,,Unknown40,,,,,"1700"
+r,,Unknown41,,,,,"2200"
+r,,Unknown42,,,,,"2300"
+r,,Unknown43,,,,,"2400"
+r,,Unknown44,,,,,"2600"
+r,,Unknown45,,,,,"2700"
+r,,Unknown46,,,,,"2900"
+r,,Unknown34,,,,,"2B00",,,IGN:4,,,,,,HEX:*,,,
+r,,Unknown47,,,,,"2F00"
+r,,Unknown48,,,,,"3600"
+r,,Unknown69,,,,,"4500"
+r,,Unknown49,,,,,"4600"
+r,,Unknown3,,,,,"4800",,,IGN:4,,,,,,HEX:*,,,
+r,,Unknown4,,,,,"4B00",,,IGN:4,,,,,,HEX:*,,,
+r,,Unknown50,,,,,"9500"
+r,,Unknown6,,,,,"9D00"
+r,,Unknown7,,,,,"9E00"
+r,,Unknown8,,,,,"9F00"
+r,,Unknown9,,,,,"A000"
+r,,Unknown10,,,,,"A200",,,IGN:4,,,,,,EXP,,,
+r,,Unknown51,,,,,"B500",,,IGN:4,,,,,,HEX:*,,,
+r,,Unknown11,,,,,"B600",,,IGN:4,,,,,,HEX:*,,,
+r,,Unknown52,,,,,"da00",,,IGN:4,,,,,,HDA:3,,,
+r,,Unknown53,,,,,"db00",,,IGN:4,,,,,,HDA:3,,,
+r,,Unknown54,,,,,"EF00",,,IGN:4,,,,,,EXP,,,
+r,,Unknown12,,,,,"F200",,,IGN:4,,,,,,HDA:3,,,
+r,,Unknown13,,,,,"F300",,,IGN:4,,,,,,HDA:3,,,
+r,,Unknown14,,,,,"F400",,,IGN:4,,,,,,HEX:*,,,
+r,,Unknown15,,,,,"F500",,,IGN:4,,,,,,HEX:*,,,
+r,,Unknown17,,,,,"F700",,,IGN:4,,,,,,HEX:*,,,
+r,,Unknown18,,,,,"F900",,,IGN:4,,,,,,HEX:*,,,
+
+*r,emm,,,,08,"B524","02000100"
+r,,Unknown66,,,,,"0100",,,IGN:4,,,,,,HEX:*,,,
+r,,Unknown19,,,,,"0F00",,,IGN:4,,,,,,HEX:*,,,
+
+*r,emm,,,,08,"B524","02000200"
+r,,Unknown67,,,,,"0100",,,IGN:4,,,,,,HEX:*,,,
+r,,Unknown20,,,,,"0200",,,IGN:4,,,,,,HEX:*,,,
+r,,Unknown21,,,,,"0600",,,IGN:4,,,,,,HEX:*,,,
+r,,Unknown55,,,,,"0700",,,IGN:4,,,,,,EXP,,,
+r,,Unknown22,,,,,"0800",,,IGN:4,,,,,,HEX:*,,,
+r,,Unknown56,,,,,"0b00"
+r,,Unknown23,,,,,"0E00",,,IGN:4,,,,,,HEX:*,,,
+r,,Unknown57,,,,,"0F00",,,IGN:4,,,,,,EXP,,,
+r,,Unknown58,,,,,"1000",,,IGN:4,,,,,,EXP,,,
+r,,Unknown59,,,,,"1200",,,IGN:4,,,,,,EXP,,,
+r,,Unknown60,,,,,"1400",,,IGN:4,,,,,,EXP,,,
+r,,Unknown33,,,,,"1500",,,IGN:4,,,,,,HEX:*,,,
+r,,Unknown24,,,,,"1E00",,,IGN:4,,,,,,HEX:*,,,
+
+*r,emm,,,,08,"B524","02000300"
+r,,Unknown25,,,,,"0500",,,IGN:4,,,,,,EXP,,,
+r,,Unknown26,,,,,"0F00",,,IGN:4,,,,,,HEX:*,,,
+r,,Unknown27,,,,,"1100",,,IGN:4,,,,,,HEX:*,,,
+r,,Unknown86,,,,,"1300",,,IGN:4,,,,,,HEX:*,,,
+r,,Unknown28,,,,,"1B00",,,IGN:4,,,,,,HEX:*,,,
+r,,Unknown29,,,,,"1C00",,,IGN:4,,,,,,HEX:*,,,
+r,,Unknown32,,,,,"2800",,,IGN:4,,,,,,HEX:*,,,
+
+*r,emm,,,,08,"B524",,,,,,,
+r,,Unknown68,,,,,"020002020200"
+r,,Unknown94,,,,,"020003021100"
+r,,Unknown89,,,,,"020003021300"
+r,,Unknown70,,,,,"020003021c00"
+*r,emm,,,,08,"B524",,,,,,,
+r,,Unknown71,,,,,"020002030200"
+r,,Unknown95,,,,,"020003031100"
+r,,Unknown90,,,,,"020003031300"
+r,,Unknown72,,,,,"020003031c00"
+*r,emm,,,,08,"B524",,,,,,,
+r,,Unknown73,,,,,"020002010200"
+r,,Unknown96,,,,,"020003011100"
+r,,Unknown93,,,,,"020003011300"
+r,,Unknown74,,,,,"020003011c00"
+*r,emm,,,,08,"B524",,,,,,,
+r,,Unknown75,,,,,"020002060200"
+r,,Unknown97,,,,,"020003061100"
+r,,Unknown92,,,,,"020003061300"
+r,,Unknown76,,,,,"020003061c00"
+*r,emm,,,,08,"B524",,,,,,,
+r,,Unknown77,,,,,"020002070200"
+r,,Unknown98,,,,,"020003071300"
+r,,Unknown78,,,,,"020003071c00"
+*r,emm,,,,08,"B524",,,,,,,
+r,,Unknown79,,,,,"020002040200"
+r,,Unknown99,,,,,"020003041100"
+r,,Unknown87,,,,,"020003041300"
+r,,Unknown80,,,,,"020003041c00"
+*r,emm,,,,08,"B524",,,,,,,
+r,,Unknown81,,,,,"020002050200"
+r,,Unknown100,,,,,"020003051100"
+r,,Unknown88,,,,,"020003051300"
+r,,Unknown82,,,,,"020003051c00"
+*r,emm,,,,08,"B524",,,,,,,
+r,,Unknown83,,,,,"020002080200"
+r,,Unknown101,,,,,"020003081100"
+r,,Unknown91,,,,,"020003081300"
+r,,Unknown84,,,,,"020003081c00"
+
+*r,emm,,,,08,"B516",1000ffff,,,,,,
+r,,Unknown61,,,,,"42030000",,,IGN:7,,,,,,ULG,,Wh, Bedeutung des Absolutwertes unklar;
+r,,Unknown62,,,,,"42040000",,,IGN:7,,,,,,ULG,,Wh, Bedeutung des Absolutwertes unklar;
+r,,Unknown63,,,,,"42050000",,,IGN:7,,,,,,ULG,,Wh, Bedeutung des Absolutwertes unklar;
+r,,Unknown64,,,,,"01000000",,,IGN:7,,,,,,ULG,,Wh, Bedeutung des Absolutwertes unklar;
+r,,Unknown85,,,15,,"01000000",,,IGN:7,,,,,,ULG,,Wh, Bedeutung des Absolutwertes unklar;
+r,,Unknown65,,,,,"41030000",,,IGN:7,,,,,,ULG,,Wh, Bedeutung des Absolutwertes unklar;
+r,,ConsumedElectricalEnergyOfSomething,Verbrauch elektrischer Energie von ? (vielleicht Wärmepumpe),,,,"83050000",,,IGN:7,,,,,,ULG,,Wh, Bedeutung des Absolutwertes unklar;
+r,,HeatGeneratedOfSomething,Erzeugte Wärme von ? (vielleicht Wärmepumpe),,,,"49050000",,,IGN:7,,,,,,ULG,,Wh, Bedeutung des Absolutwertes unklar;