diff --git a/src/zapit/include/zapit/channel.h b/src/zapit/include/zapit/channel.h
index 67fab006c..608424e88 100644
--- a/src/zapit/include/zapit/channel.h
+++ b/src/zapit/include/zapit/channel.h
@@ -29,6 +29,7 @@
 #include <cstdlib>
 #include <xmltree/xmlinterface.h>
 #include <sectionsdclient/sectionsdclient.h>
+#include <set>
 
 /* zapit */
 #include "ci.h"
@@ -108,6 +109,9 @@ class CZapitAudioChannel
 
 class CChannelList;
 
+typedef std::set<int> casys_map_t;
+typedef casys_map_t::iterator casys_map_iterator_t;
+
 class CZapitChannel
 {
 	private:
@@ -155,9 +159,13 @@ class CZapitChannel
 
 		std::string			ttx_language_code;
 
+		uint8_t				record_demux;
+
 		friend class CChannelList;
 
 	public:
+		casys_map_t			camap;
+
 		bool				bAlwaysLocked;
 
 		int				number;
@@ -167,6 +175,7 @@ class CZapitChannel
 		unsigned char			scrambled;
 		char *				pname;
 		bool				has_bouquet;
+		uint8_t				polarization;
 
 		/* constructor, desctructor */
 		CZapitChannel(const std::string & p_name, t_service_id p_sid, t_transport_stream_id p_tsid, t_original_network_id p_onid, unsigned char p_service_type, t_satellite_position p_satellite_position, freq_id_t freq);
@@ -232,6 +241,8 @@ class CZapitChannel
 
 		void dumpServiceXml(FILE * fd, const char * action = NULL);
 		void dumpBouquetXml(FILE * fd);
+		void setRecordDemux(int num) { record_demux = num; };
+		int  getRecordDemux() { return record_demux; };
 };
 
 #endif /* __zapit_channel_h__ */
diff --git a/src/zapit/src/channel.cpp b/src/zapit/src/channel.cpp
index db27236ba..5cf65aa35 100644
--- a/src/zapit/src/channel.cpp
+++ b/src/zapit/src/channel.cpp
@@ -46,6 +46,8 @@ CZapitChannel::CZapitChannel(const std::string & p_name, t_service_id p_sid, t_t
 	last_unlocked_EPGid = 0;
 	last_unlocked_time = 0;
 	has_bouquet = false;
+	record_demux = 2;
+	polarization = 0;
 //printf("NEW CHANNEL %s %x\n", name.c_str(), (int) this);
 }
 
@@ -55,6 +57,7 @@ CZapitChannel::~CZapitChannel(void)
 	resetPids();
 	setCaPmt(NULL);
 	setRawPmt(NULL);
+	camap.clear();
 
 	//if(currentEvent)
 	//	delete currentEvent;