Index: src/libchcore/TSQLiteSerializerContainer.cpp
===================================================================
diff -u -N -rc8e73b75027d5e17fb8b1e1eb40e64f40fc62547 -r081055369d6b332ef1651877756657973b1b2d9c
--- src/libchcore/TSQLiteSerializerContainer.cpp	(.../TSQLiteSerializerContainer.cpp)	(revision c8e73b75027d5e17fb8b1e1eb40e64f40fc62547)
+++ src/libchcore/TSQLiteSerializerContainer.cpp	(.../TSQLiteSerializerContainer.cpp)	(revision 081055369d6b332ef1651877756657973b1b2d9c)
@@ -32,15 +32,13 @@
 using namespace sqlite;
 
 TSQLiteSerializerContainer::TSQLiteSerializerContainer(const TString& strName, const sqlite::TSQLiteDatabasePtr& spDB) :
-	m_spColumns(new TSQLiteColumnsDefinition),
 	m_strName(strName),
 	m_spDB(spDB)
 {
 }
 
 TSQLiteSerializerContainer::TSQLiteSerializerContainer(const TString& strName, size_t stParentID, const sqlite::TSQLiteDatabasePtr& spDB) :
 	m_stParentID(stParentID),
-	m_spColumns(new TSQLiteColumnsDefinition),
 	m_strName(strName),
 	m_spDB(spDB)
 {
@@ -53,7 +51,7 @@
 chcore::ISerializerRowDataPtr TSQLiteSerializerContainer::AddRow(size_t stRowID)
 {
 	RowMap::iterator iterInsert = m_mapRows.insert(
-			std::make_pair(stRowID, TSQLiteSerializerRowDataPtr(new TSQLiteSerializerRowData(stRowID, m_spColumns, true)))
+			std::make_pair(stRowID, TSQLiteSerializerRowDataPtr(new TSQLiteSerializerRowData(stRowID, m_tColumns, true)))
 		).first;
 	return (*iterInsert).second;
 }
@@ -62,7 +60,7 @@
 {
 	RowMap::iterator iterFnd = m_mapRows.find(stRowID);
 	if(iterFnd == m_mapRows.end())
-		iterFnd = m_mapRows.insert(std::make_pair(stRowID, TSQLiteSerializerRowDataPtr(new TSQLiteSerializerRowData(stRowID, m_spColumns, false)))).first;
+		iterFnd = m_mapRows.insert(std::make_pair(stRowID, TSQLiteSerializerRowDataPtr(new TSQLiteSerializerRowData(stRowID, m_tColumns, false)))).first;
 
 	return (*iterFnd).second;
 }
@@ -87,13 +85,13 @@
 
 ISerializerRowReaderPtr TSQLiteSerializerContainer::GetRowReader()
 {
-	TSQLiteSerializerRowReaderPtr spRowReader(new TSQLiteSerializerRowReader(m_spDB, m_spColumns, m_strName));
+	TSQLiteSerializerRowReaderPtr spRowReader(new TSQLiteSerializerRowReader(m_spDB, m_tColumns, m_strName));
 	return spRowReader;
 }
 
-chcore::IColumnsDefinitionPtr TSQLiteSerializerContainer::GetColumnsDefinition() const
+IColumnsDefinition& TSQLiteSerializerContainer::GetColumnsDefinition()
 {
-	return m_spColumns;
+	return m_tColumns;
 }
 
 void TSQLiteSerializerContainer::Flush()