Index: src/libchcore/TTaskManager.h
===================================================================
diff -u -r9479911a096555a7504c5c8a8eaee83ecb63440c -rd0bc3c187684f54894c7280a936d5507a5e49f35
--- src/libchcore/TTaskManager.h	(.../TTaskManager.h)	(revision 9479911a096555a7504c5c8a8eaee83ecb63440c)
+++ src/libchcore/TTaskManager.h	(.../TTaskManager.h)	(revision d0bc3c187684f54894c7280a936d5507a5e49f35)
@@ -20,12 +20,12 @@
 #define __TASKMANAGER_H__
 
 #include "libchcore.h"
-#include "FeedbackHandlerBase.h"
+#include "IFeedbackHandlerFactory.h"
 #include "TPath.h"
 #include "TTaskManagerStatsSnapshot.h"
 #include "TTaskInfo.h"
-#include "ITaskManagerSerializer.h"
 #include "ISerializer.h"
+#include "ISerializerFactory.h"
 
 BEGIN_CHCORE_NAMESPACE
 
@@ -38,7 +38,11 @@
 class LIBCHCORE_API TTaskManager
 {
 public:
-	TTaskManager(const ISerializerPtr& spSerializer, IFeedbackHandlerFactory* piFeedbackHandlerFactory);
+	TTaskManager(const ISerializerFactoryPtr& spSerializerFactory,
+		const IFeedbackHandlerFactoryPtr& spFeedbackHandlerFactory,
+		const TSmartPath& pathLogDir,
+		bool bForceRecreateSerializer = false);
+
 	~TTaskManager();
 
 	void Store();
@@ -77,8 +81,6 @@
 protected:
 	void StopAllTasksNL();
 
-	IFeedbackHandler* CreateNewFeedbackHandler();
-
 	TSmartPath CreateTaskLogPath(const TString& strTaskUuid) const;
 
 private:
@@ -90,12 +92,12 @@
 	TTaskInfoContainer m_tTasks;	// serializable
 
 	TSmartPath m_pathLogDir;		// config-based, not serializable
-	taskid_t m_stNextTaskID;		// serializable
 
-	IFeedbackHandlerFactory* m_piFeedbackFactory;
 #pragma warning(push)
 #pragma warning(disable: 4251)
+	IFeedbackHandlerFactoryPtr m_spFeedbackFactory;
 	ISerializerPtr m_spSerializer;
+	ISerializerFactoryPtr m_spSerializerFactory;
 #pragma warning(pop)
 };