diff --git a/core/Makefile.dep b/core/Makefile.dep
index 9d1cd32..e9764ab 100755
--- a/core/Makefile.dep
+++ b/core/Makefile.dep
@@ -4,8 +4,8 @@ acceptbaseparser.o: acceptbaseparser.h
 app.o: app.h config.h confparser.h htmlfilter.h system.h dirs.h item.h
 app.o: dircontainer.h db.h user.h group.h thread.h error.h log.h
 app.o: ugcontainer.h ticket.h request.h requesttypes.h session.h plugindata.h
-app.o: rebus.h mounts.h mount.h users.h lastcontainer.h groups.h loadavg.h
-app.o: sessionmanager.h sessioncontainer.h notify.h
+app.o: rebus.h mounts.h mount.h mountparser.h users.h lastcontainer.h
+app.o: groups.h loadavg.h sessionmanager.h sessioncontainer.h notify.h
 app.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
 app.o: ../core/mount.h ../core/locale.h ../core/config.h ../templates/misc.h
 app.o: ../templates/localefilter.h ../core/locale.h ../functions/functions.h
@@ -36,10 +36,11 @@ compress.o: compress.h log.h
 config.o: config.h confparser.h htmlfilter.h log.h plugin.h pluginmsg.h
 config.o: plugindata.h request.h requesttypes.h session.h item.h error.h
 config.o: user.h rebus.h system.h dirs.h dircontainer.h db.h group.h thread.h
-config.o: ugcontainer.h ticket.h mounts.h mount.h users.h lastcontainer.h
-config.o: groups.h loadavg.h sessionmanager.h sessioncontainer.h
-config.o: ../functions/functions.h ../functions/functionbase.h ../core/item.h
-config.o: ../core/db.h ../core/request.h ../core/config.h ../core/system.h
+config.o: ugcontainer.h ticket.h mounts.h mount.h mountparser.h users.h
+config.o: lastcontainer.h groups.h loadavg.h sessionmanager.h
+config.o: sessioncontainer.h ../functions/functions.h
+config.o: ../functions/functionbase.h ../core/item.h ../core/db.h
+config.o: ../core/request.h ../core/config.h ../core/system.h
 config.o: ../core/notify.h ../../ezc/src/ezc.h ../functions/functionparser.h
 config.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h
 config.o: ../functions/privchanger.h ../functions/chown.h
@@ -72,7 +73,7 @@ dirs.o: plugindata.h rebus.h config.h confparser.h htmlfilter.h notify.h
 dirs.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
 dirs.o: ../core/mount.h ../core/locale.h ../core/config.h ../templates/misc.h
 dirs.o: ../templates/localefilter.h ../core/locale.h system.h mounts.h
-dirs.o: mount.h users.h lastcontainer.h groups.h loadavg.h
+dirs.o: mount.h mountparser.h users.h lastcontainer.h groups.h loadavg.h
 groups.o: groups.h group.h ugcontainer.h log.h db.h item.h user.h thread.h
 groups.o: error.h dircontainer.h ticket.h
 htmlfilter.o: htmlfilter.h
@@ -90,21 +91,47 @@ mountparser.o: rebus.h config.h confparser.h htmlfilter.h misc.h
 mounts.o: mounts.h mount.h error.h log.h dirs.h item.h dircontainer.h db.h
 mounts.o: user.h group.h thread.h ugcontainer.h ticket.h request.h
 mounts.o: requesttypes.h session.h plugindata.h rebus.h config.h confparser.h
-mounts.o: htmlfilter.h mountparser.h
+mounts.o: htmlfilter.h mountparser.h plugin.h pluginmsg.h system.h users.h
+mounts.o: lastcontainer.h groups.h loadavg.h sessionmanager.h
+mounts.o: sessioncontainer.h ../functions/functions.h
+mounts.o: ../functions/functionbase.h ../core/item.h ../core/db.h
+mounts.o: ../core/request.h ../core/config.h ../core/system.h
+mounts.o: ../core/notify.h ../../ezc/src/ezc.h ../functions/functionparser.h
+mounts.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h
+mounts.o: ../functions/privchanger.h ../functions/chown.h
+mounts.o: ../functions/ckeditor.h ../functions/cp.h
+mounts.o: ../functions/createthread.h ../functions/createticket.h
+mounts.o: ../functions/default.h ../functions/download.h
+mounts.o: ../functions/editticket.h ../functions/emacs.h ../functions/last.h
+mounts.o: ../functions/login.h ../functions/logout.h ../functions/ls.h
+mounts.o: ../functions/mkdir.h ../functions/mv.h ../functions/node.h
+mounts.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h
+mounts.o: ../functions/run.h ../functions/subject.h ../functions/funthread.h
+mounts.o: ../core/thread.h ../functions/funticket.h ../core/ticket.h
+mounts.o: ../functions/template.h ../functions/tinymce.h ../functions/uname.h
+mounts.o: ../functions/upload.h ../functions/uptime.h ../functions/who.h
+mounts.o: ../core/htmlfilter.h ../templates/templates.h
+mounts.o: ../templates/patterncacher.h ../core/item.h misc.h
+mounts.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h
+mounts.o: ../core/log.h ../templates/indexpatterns.h
+mounts.o: ../templates/localefilter.h ../core/locale.h ../core/locale.h
+mounts.o: ../core/sessionmanager.h
 notify.o: log.h notify.h ../templatesnotify/templatesnotify.h
 notify.o: ../../ezc/src/ezc.h ../core/mount.h ../core/locale.h confparser.h
 notify.o: ../core/config.h ../templates/misc.h ../templates/localefilter.h
 notify.o: ../core/locale.h request.h requesttypes.h session.h item.h error.h
 notify.o: user.h plugindata.h rebus.h config.h htmlfilter.h system.h dirs.h
 notify.o: dircontainer.h db.h group.h thread.h ugcontainer.h ticket.h
-notify.o: mounts.h mount.h users.h lastcontainer.h groups.h loadavg.h misc.h
+notify.o: mounts.h mount.h mountparser.h users.h lastcontainer.h groups.h
+notify.o: loadavg.h misc.h
 plugin.o: plugin.h pluginmsg.h log.h plugindata.h config.h confparser.h
 plugin.o: htmlfilter.h request.h requesttypes.h session.h item.h error.h
 plugin.o: user.h rebus.h system.h dirs.h dircontainer.h db.h group.h thread.h
-plugin.o: ugcontainer.h ticket.h mounts.h mount.h users.h lastcontainer.h
-plugin.o: groups.h loadavg.h sessionmanager.h sessioncontainer.h
-plugin.o: ../functions/functions.h ../functions/functionbase.h ../core/item.h
-plugin.o: ../core/db.h ../core/request.h ../core/config.h ../core/system.h
+plugin.o: ugcontainer.h ticket.h mounts.h mount.h mountparser.h users.h
+plugin.o: lastcontainer.h groups.h loadavg.h sessionmanager.h
+plugin.o: sessioncontainer.h ../functions/functions.h
+plugin.o: ../functions/functionbase.h ../core/item.h ../core/db.h
+plugin.o: ../core/request.h ../core/config.h ../core/system.h
 plugin.o: ../core/notify.h ../../ezc/src/ezc.h ../functions/functionparser.h
 plugin.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h
 plugin.o: ../functions/privchanger.h ../functions/chown.h
@@ -128,8 +155,8 @@ plugin.o: ../core/sessionmanager.h
 plugindata.o: plugindata.h plugin.h pluginmsg.h log.h config.h confparser.h
 plugindata.o: htmlfilter.h request.h requesttypes.h session.h item.h error.h
 plugindata.o: user.h rebus.h system.h dirs.h dircontainer.h db.h group.h
-plugindata.o: thread.h ugcontainer.h ticket.h mounts.h mount.h users.h
-plugindata.o: lastcontainer.h groups.h loadavg.h sessionmanager.h
+plugindata.o: thread.h ugcontainer.h ticket.h mounts.h mount.h mountparser.h
+plugindata.o: users.h lastcontainer.h groups.h loadavg.h sessionmanager.h
 plugindata.o: sessioncontainer.h ../functions/functions.h
 plugindata.o: ../functions/functionbase.h ../core/item.h ../core/db.h
 plugindata.o: ../core/request.h ../core/config.h ../core/system.h
@@ -162,14 +189,15 @@ rebus.o: error.h user.h plugindata.h config.h confparser.h htmlfilter.h
 request.o: request.h requesttypes.h session.h item.h error.h log.h user.h
 request.o: plugindata.h rebus.h config.h confparser.h htmlfilter.h plugin.h
 request.o: pluginmsg.h system.h dirs.h dircontainer.h db.h group.h thread.h
-request.o: ugcontainer.h ticket.h mounts.h mount.h users.h lastcontainer.h
-request.o: groups.h loadavg.h sessionmanager.h sessioncontainer.h
-request.o: ../functions/functions.h ../functions/functionbase.h
-request.o: ../core/item.h ../core/db.h ../core/request.h ../core/config.h
-request.o: ../core/system.h ../core/notify.h ../../ezc/src/ezc.h
-request.o: ../functions/functionparser.h ../functions/adduser.h
-request.o: ../functions/cat.h ../functions/chmod.h ../functions/privchanger.h
-request.o: ../functions/chown.h ../functions/ckeditor.h ../functions/cp.h
+request.o: ugcontainer.h ticket.h mounts.h mount.h mountparser.h users.h
+request.o: lastcontainer.h groups.h loadavg.h sessionmanager.h
+request.o: sessioncontainer.h ../functions/functions.h
+request.o: ../functions/functionbase.h ../core/item.h ../core/db.h
+request.o: ../core/request.h ../core/config.h ../core/system.h
+request.o: ../core/notify.h ../../ezc/src/ezc.h ../functions/functionparser.h
+request.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h
+request.o: ../functions/privchanger.h ../functions/chown.h
+request.o: ../functions/ckeditor.h ../functions/cp.h
 request.o: ../functions/createthread.h ../functions/createticket.h
 request.o: ../functions/default.h ../functions/download.h
 request.o: ../functions/editticket.h ../functions/emacs.h ../functions/last.h
@@ -193,25 +221,26 @@ sessionmanager.o: sessionmanager.h sessioncontainer.h session.h item.h
 sessionmanager.o: error.h log.h user.h plugindata.h rebus.h lastcontainer.h
 sessionmanager.o: config.h confparser.h htmlfilter.h request.h requesttypes.h
 sessionmanager.o: system.h dirs.h dircontainer.h db.h group.h thread.h
-sessionmanager.o: ugcontainer.h ticket.h mounts.h mount.h users.h groups.h
-sessionmanager.o: loadavg.h sessionparser.h plugin.h pluginmsg.h
-sessionmanager.o: ../functions/functions.h ../functions/functionbase.h
-sessionmanager.o: ../core/item.h ../core/db.h ../core/request.h
-sessionmanager.o: ../core/config.h ../core/system.h ../core/notify.h
-sessionmanager.o: ../../ezc/src/ezc.h ../functions/functionparser.h
-sessionmanager.o: ../functions/adduser.h ../functions/cat.h
-sessionmanager.o: ../functions/chmod.h ../functions/privchanger.h
-sessionmanager.o: ../functions/chown.h ../functions/ckeditor.h
-sessionmanager.o: ../functions/cp.h ../functions/createthread.h
-sessionmanager.o: ../functions/createticket.h ../functions/default.h
-sessionmanager.o: ../functions/download.h ../functions/editticket.h
-sessionmanager.o: ../functions/emacs.h ../functions/last.h
-sessionmanager.o: ../functions/login.h ../functions/logout.h
-sessionmanager.o: ../functions/ls.h ../functions/mkdir.h ../functions/mv.h
-sessionmanager.o: ../functions/node.h ../functions/priv.h
-sessionmanager.o: ../functions/reload.h ../functions/rm.h ../functions/run.h
-sessionmanager.o: ../functions/subject.h ../functions/funthread.h
-sessionmanager.o: ../core/thread.h ../functions/funticket.h ../core/ticket.h
+sessionmanager.o: ugcontainer.h ticket.h mounts.h mount.h mountparser.h
+sessionmanager.o: users.h groups.h loadavg.h sessionparser.h plugin.h
+sessionmanager.o: pluginmsg.h ../functions/functions.h
+sessionmanager.o: ../functions/functionbase.h ../core/item.h ../core/db.h
+sessionmanager.o: ../core/request.h ../core/config.h ../core/system.h
+sessionmanager.o: ../core/notify.h ../../ezc/src/ezc.h
+sessionmanager.o: ../functions/functionparser.h ../functions/adduser.h
+sessionmanager.o: ../functions/cat.h ../functions/chmod.h
+sessionmanager.o: ../functions/privchanger.h ../functions/chown.h
+sessionmanager.o: ../functions/ckeditor.h ../functions/cp.h
+sessionmanager.o: ../functions/createthread.h ../functions/createticket.h
+sessionmanager.o: ../functions/default.h ../functions/download.h
+sessionmanager.o: ../functions/editticket.h ../functions/emacs.h
+sessionmanager.o: ../functions/last.h ../functions/login.h
+sessionmanager.o: ../functions/logout.h ../functions/ls.h
+sessionmanager.o: ../functions/mkdir.h ../functions/mv.h ../functions/node.h
+sessionmanager.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h
+sessionmanager.o: ../functions/run.h ../functions/subject.h
+sessionmanager.o: ../functions/funthread.h ../core/thread.h
+sessionmanager.o: ../functions/funticket.h ../core/ticket.h
 sessionmanager.o: ../functions/template.h ../functions/tinymce.h
 sessionmanager.o: ../functions/uname.h ../functions/upload.h
 sessionmanager.o: ../functions/uptime.h ../functions/who.h
@@ -229,10 +258,11 @@ sessionparser.o: dircontainer.h ticket.h
 system.o: system.h dirs.h item.h dircontainer.h db.h user.h group.h thread.h
 system.o: error.h log.h ugcontainer.h ticket.h request.h requesttypes.h
 system.o: session.h plugindata.h rebus.h config.h confparser.h htmlfilter.h
-system.o: mounts.h mount.h users.h lastcontainer.h groups.h loadavg.h misc.h
-system.o: notify.h ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
-system.o: ../core/mount.h ../core/locale.h ../core/config.h
-system.o: ../templates/misc.h ../templates/localefilter.h ../core/locale.h
+system.o: mounts.h mount.h mountparser.h users.h lastcontainer.h groups.h
+system.o: loadavg.h misc.h notify.h ../templatesnotify/templatesnotify.h
+system.o: ../../ezc/src/ezc.h ../core/mount.h ../core/locale.h
+system.o: ../core/config.h ../templates/misc.h ../templates/localefilter.h
+system.o: ../core/locale.h
 users.o: users.h user.h ugcontainer.h log.h lastcontainer.h request.h
 users.o: requesttypes.h session.h item.h error.h plugindata.h rebus.h
 users.o: config.h confparser.h htmlfilter.h db.h group.h thread.h
diff --git a/core/app.cpp b/core/app.cpp
index 32921b9..7c7c0b0 100755
--- a/core/app.cpp
+++ b/core/app.cpp
@@ -147,6 +147,11 @@ bool App::Init()
 	if( !notify.Init() )
 		return false;
 
+	// call this after system.Init() (mount points identificators should be created)
+	templates_notify.SetMountTypes(	system.mounts.MountTypeCms(),
+									system.mounts.MountTypeThread(),
+									system.mounts.MountTypeTicket() );
+
 	// init templates after functions are created
 	templates.ReadIndexFileNames();
 	templates.ReadTemplates();
diff --git a/core/mount.cpp b/core/mount.cpp
index 9b21277..597bed7 100755
--- a/core/mount.cpp
+++ b/core/mount.cpp
@@ -14,106 +14,9 @@
 
 Mount::Mount()
 {
-	type   = cms;
 	dir_id = -1;
-	fs     = simplefs;
-
-	param.resize(par_none);
-}
-
-
-
-const char * Mount::TypeToStr()
-{
-static char buffer[30];
-	
-	switch( type )
-	{
-		case cms:
-		sprintf(buffer, "cms");
-		break;	
-	
-		case thread:
-		sprintf(buffer, "thread");
-		break;
-		
-		case ticket:
-		sprintf(buffer, "ticket");
-		break;
-
-		default:
-		sprintf(buffer, "unknown");
-		break;	
-	}
-
-return buffer;
-}
-
-
-const char * Mount::FsToStr()
-{
-static char buffer[30];
-	
-	switch( fs )
-	{
-		case simplefs:
-		sprintf(buffer, "simplefs");
-		break;	
-	
-		case hashfs:
-		sprintf(buffer, "hashfs");
-		break;
-		
-		default:
-		sprintf(buffer, "unknown");
-		break;	
-	}
-
-return buffer;
-}
-
-
-
-Mount::ParamCode Mount::ParseParam(const char * param_name)
-{
-	struct ParName
-	{
-		ParamCode param_code;
-		const char * name;
-	};
-
-	static ParName par_name_tab[] =	{
-		{ par_page,						"page" },
-		{ par_thread,					"thread" },
-		{ par_ticket,					"ticket" },
-		{ par_ticket_type,				"ticket_type" },
-		{ par_ticket_type_default,		"ticket_type_default" },
-		{ par_ticket_status,			"ticket_status" },
-		{ par_ticket_status_default,	"ticket_status_default" },
-		{ par_ticket_priority,			"ticket_priority" },
-		{ par_ticket_priority_default,	"ticket_priority_default" },
-		{ par_ticket_category,			"ticket_category" },
-		{ par_ticket_category_default,	"ticket_category_default" },
-		{ par_ticket_expected,			"ticket_expected" },
-		{ par_ticket_expected_default,	"ticket_expected_default" },
-		{ par_createthread_on,			"createthread_on" },
-		{ par_createticket_on,			"createticket_on" },
-		{ par_only_root_remove,			"only_root_remove" },
-		{ par_emacs_on,					"emacs_on" },
-		{ par_mkdir_on,					"mkdir_on" },
-		{ par_app,						"app" },
-		{ par_html_template,			"html_template" },
-	};
-
-	size_t i, len = sizeof(par_name_tab) / sizeof(ParName);
-
-	for(i=0 ; i<len ; ++i)
-	{
-		if( strcmp(par_name_tab[i].name, param_name) == 0 )
-			return par_name_tab[i].param_code;
-	}
-
-return par_none;
+	type   = -1;
+	fs     = -1;
 }
 
 
@@ -127,8 +30,11 @@ size_t i;
 }
 
 
-bool Mount::IsPar(Mount::ParamCode code)
+bool Mount::IsPar(int code)
 {
+	if( code < 0 || code >= (int)param.size() )
+		return false;
+
 	if( !param[code].defined )
 		return false;
 
@@ -137,9 +43,12 @@ return true;
 
 
 
-bool Mount::IsArg(Mount::ParamCode code, const char * arg)
+bool Mount::IsArg(int code, const char * arg)
 {
-ParamArg::iterator i;	
+	ParamRow::ParamArg::iterator i;	
+
+	if( code < 0 || code >= (int)param.size() )
+		return false;
 
 	if( !param[code].defined )
 		return false;
@@ -154,15 +63,18 @@ return false;
 }
 
 
-bool Mount::IsArg(Mount::ParamCode code, const std::string & arg)
+bool Mount::IsArg(int code, const std::string & arg)
 {
 	return IsArg(code, arg.c_str());
 }
 
 
-bool Mount::IsArg(Mount::ParamCode code, int arg)
+bool Mount::IsArg(int code, int arg)
 {
-ParamArg::iterator i;	
+	ParamRow::ParamArg::iterator i;	
+
+	if( code < 0 || code >= (int)param.size() )
+		return false;
 
 	if( !param[code].defined )
 		return false;
@@ -177,15 +89,23 @@ return false;
 }
 
 
-
-const std::string * Mount::FirstHtmlTemplate() const
+const std::string & Mount::Arg(int code, int arg) const
 {
-	if( !param[par_html_template].defined )
-		return 0;
+	if( code < 0 || code >= (int)param.size() )
+		return empty_str;
 
-	if( param[par_html_template].arg.empty() )
-		return 0;
+	if( !param[code].defined )
+		return empty_str;
 
-return & param[par_html_template].arg[0];
+	if( arg >= (int)param[code].arg.size() )
+		return empty_str;
+
+return param[code].arg[arg];
+}
+
+
+const std::string & Mount::FirstArg(int code) const
+{
+	return Arg(code, 0);
 }
 
diff --git a/core/mount.h b/core/mount.h
index d266165..aa4be46 100755
--- a/core/mount.h
+++ b/core/mount.h
@@ -17,59 +17,14 @@
 
 
 
-
 class Mount
 {
 public:
 
-
-	enum Type
-	{
-		cms = 0,
-		thread,
-		ticket
-	};
-
-	enum Fs
-	{
-		simplefs = 0,
-		hashfs
-	};
-
-
-	// the first should be with 0 index
-	// the last should be 'none'
-	enum ParamCode
-	{
-		par_page = 0,
-		par_thread,
-		par_ticket,
-		par_ticket_type,
-		par_ticket_type_default,
-		par_ticket_status,
-		par_ticket_status_default,
-		par_ticket_priority,
-		par_ticket_priority_default,
-		par_ticket_category,
-		par_ticket_category_default,
-		par_ticket_expected,
-		par_ticket_expected_default,
-		par_createthread_on,
-		par_createticket_on,
-		par_only_root_remove,
-		par_emacs_on,
-		par_mkdir_on,
-		par_app,
-		par_html_template,
-		
-		par_none
-	};
-
-	typedef std::vector<std::string> ParamArg;
-
-
 	struct ParamRow
 	{
+		typedef std::vector<std::string> ParamArg;
+
 		bool defined;
 		ParamArg arg;
 
@@ -78,31 +33,36 @@ public:
 	};
 
 	typedef std::vector<ParamRow> Param;
+
+
+	long  dir_id;
+	int   type;
+	int   fs;
 	Param param;
 
-	long dir_id;
-	Type type;
-	Fs fs;
+
 
 
 	Mount();
-	const char * TypeToStr();
-	const char * FsToStr();
-	static ParamCode ParseParam(const char * param);
-
-
 	void ClearParams();
 
+	bool IsPar(int code);
 
-	bool IsPar(Mount::ParamCode code);
+	bool IsArg(int code, const char * arg);
+	bool IsArg(int code, const std::string & arg);
+	bool IsArg(int code, int arg);
 
-	bool IsArg(Mount::ParamCode code, const char * arg);
-	bool IsArg(Mount::ParamCode code, const std::string & arg);
-	bool IsArg(Mount::ParamCode code, int arg);
+	// returning the arg argument if defined (or an empty string)
+	const std::string & Arg(int code, int arg) const;
 
-	// returning a name to html template (can be null if not defined)
-	const std::string * FirstHtmlTemplate() const;
+	// returning the first argument (arg=0) if defined (or an empty string)
+	const std::string & FirstArg(int code) const;
 
+
+private:
+
+	// for Arg() methods when the argument is not defined
+	const std::string empty_str;
 };
 
 
diff --git a/core/mountparser.cpp b/core/mountparser.cpp
index bd81ad6..cd11985 100755
--- a/core/mountparser.cpp
+++ b/core/mountparser.cpp
@@ -12,12 +12,40 @@
 #include "misc.h"
 
 
+MountParser::MountParser()
+{
+	dirs = 0;
+	mount_type_tab = 0;
+	mount_fs_tab   = 0;
+	mount_par_tab  = 0;
+}
+
+
 void MountParser::SetDirs(Dirs * pdirs)
 {
 	dirs = pdirs;
 }
 
 
+void MountParser::SetMountTypeTab(const std::vector<std::string> & tab)
+{
+	mount_type_tab = &tab;
+}
+
+
+void MountParser::SetMountFsTab(const std::vector<std::string> & tab)
+{
+	mount_fs_tab = &tab;
+}
+
+
+void MountParser::SetMountParTab(const std::vector<std::string> & tab)
+{
+	mount_par_tab = &tab;
+}
+
+
+
 bool MountParser::IsWhite(int c)
 {
 	if( c==' ' || c=='\t' || c==13 || c==160 )
@@ -122,7 +150,7 @@ void MountParser::ReadWord(std::string & res, bool comma_bracket_separator)
 
 
 
-void MountParser::ReadParamArgsLoop(Mount::ParamArg & args)
+void MountParser::ReadParamArgsLoop(Mount::ParamRow::ParamArg & args)
 {
 	SkipWhite();
 
@@ -139,7 +167,7 @@ void MountParser::ReadParamArgsLoop(Mount::ParamArg & args)
 }
 
 
-void MountParser::ReadParamArgs(Mount::ParamArg & args)
+void MountParser::ReadParamArgs(Mount::ParamRow::ParamArg & args)
 {
 	SkipWhite();
 	args.clear();
@@ -177,7 +205,7 @@ void MountParser::ReadParamName(std::string & res)
 }
 
 
-void MountParser::ReadParam(std::string & res, Mount::ParamArg & args)
+void MountParser::ReadParam(std::string & res, Mount::ParamRow::ParamArg & args)
 {
 	ReadParamName(res);
 
@@ -193,6 +221,17 @@ void MountParser::ReadParam(std::string & res, Mount::ParamArg & args)
 }
 
 
+int MountParser::FindIndex(const std::vector<std::string> * tab, const std::string & value)
+{
+	for(size_t i=0 ; i < tab->size() ; ++i)
+	{
+		if( (*tab)[i] == value )
+			return static_cast<int>(i);
+	}
+
+return -1;
+}
+
 
 void MountParser::ReadMountType()
 {
@@ -202,24 +241,14 @@ void MountParser::ReadMountType()
 	{
 		// an empty line (some white characters only)
 		err = WINIX_ERR_EMPTY;
+		return;
 	}
-	else
-	if( temp == "cms" )
+
+	mount.type = FindIndex(mount_type_tab, temp);
+
+	if( mount.type != -1 )
 	{
-		mount.type = Mount::cms;
-		log << log3 << "MP: mount type: cms" << logend;	
-	}
-	else
-	if( temp == "thread" )
-	{
-		mount.type = Mount::thread;
-		log << log3 << "MP: mount type: thread" << logend;
-	}
-	else
-	if( temp == "ticket" )
-	{
-		mount.type = Mount::ticket;
-		log << log3 << "MP: mount type: ticket" << logend;
+		log << log3 << "MP: mount type: " << (*mount_type_tab)[mount.type] << logend;
 	}
 	else
 	{
@@ -239,12 +268,12 @@ void MountParser::ReadMountPoint()
 	if( pdir )
 	{
 		mount.dir_id = pdir->id;
-		log << log3 << "MP: mount point: " << temp << logend;	
+		log << log3 << "MP: mount point (directory): " << temp << logend;	
 	}
 	else
 	{
 		err = WINIX_ERR_NO_MOUNTPOINT;
-		log << log1 << "MP: there is no such a mount point: " << temp << logend;
+		log << log1 << "MP: there is no such a mount point (directory): " << temp << logend;
 	}
 }
 
@@ -253,17 +282,11 @@ void MountParser::ReadMountPoint()
 void MountParser::ReadFs()
 {
 	ReadWord(temp);
+	mount.fs = FindIndex(mount_fs_tab, temp);
 
-	if( temp == "simplefs" )
+	if( mount.fs != -1 )
 	{
-		mount.fs = Mount::simplefs;
-		log << log1 << "MP: file system: simplefs" << logend;
-	}
-	else
-	if( temp == "hashfs" )
-	{
-		mount.fs = Mount::hashfs;
-		log << log1 << "MP: file system: hashfs" << logend;	
+		log << log1 << "MP: file system: " << (*mount_fs_tab)[mount.fs] << logend;
 	}
 	else
 	{
@@ -299,12 +322,12 @@ void MountParser::ReadMountParams()
 	
 	for( ReadParam(temp, param_args) ; !temp.empty() ; ReadParam(temp, param_args) )
 	{
-		Mount::ParamCode p = Mount::ParseParam(temp.c_str());
+		int code = FindIndex(mount_par_tab, temp);
 
-		if( p != Mount::par_none )
+		if( code != -1 )
 		{
-			mount.param[p].defined = true;
-			mount.param[p].arg     = param_args;
+			mount.param[code].defined = true;
+			mount.param[code].arg     = param_args;
 			LogMountParams();
 		}
 		else
@@ -352,8 +375,23 @@ void MountParser::ReadRow(std::map<long, Mount> & output)
 
 Error MountParser::Parse(const std::string & input, std::map<long, Mount> & output)
 {
+	if( !dirs || !mount_type_tab || !mount_fs_tab || !mount_par_tab )
+	{
+		log << log1 << "pdir: " << pdir << logend;
+		log << log1 << "type: " << mount_type_tab << logend;
+		log << log1 << "fs:   " << mount_fs_tab << logend;
+		log << log1 << "par:  " << mount_par_tab << logend;
+
+		log << log1 << "MP: input tables not set" << logend;
+		return WINIX_NOTHING_TO_DO; // !! may a better code?
+	}
+
 	pinput = input.c_str();
 	err    = WINIX_ERR_OK;
+
+	mount.param.resize(mount_par_tab->size());
+	mount.ClearParams();
+
 	output.clear();
 	
 	while( *pinput && err == WINIX_ERR_OK )
diff --git a/core/mountparser.h b/core/mountparser.h
index 780c96c..37f2364 100755
--- a/core/mountparser.h
+++ b/core/mountparser.h
@@ -27,13 +27,21 @@ class MountParser
 {
 public:
 
+	MountParser();
 	Error Parse(const std::string & input, std::map<long, Mount> & output);
 	void SetDirs(Dirs * pdirs);
+	void SetMountTypeTab(const std::vector<std::string> & tab);
+	void SetMountFsTab(const std::vector<std::string> & tab);
+	void SetMountParTab(const std::vector<std::string> & tab);
 
 private:
 
 	Dirs * dirs;
 
+	const std::vector<std::string> * mount_type_tab;
+	const std::vector<std::string> * mount_fs_tab;
+	const std::vector<std::string> * mount_par_tab;
+
 	bool IsWhite(int c);
 	void SkipWhite();
 	void SkipLine();
@@ -41,10 +49,11 @@ private:
 	void ReadWordWhite(std::string & res);
 	void ReadWordComma(std::string & res);
 	void ReadWord(std::string & res, bool comma_bracket_separator = false);
-	void ReadParamArgsLoop(Mount::ParamArg & args);
-	void ReadParamArgs(Mount::ParamArg & args);
+	void ReadParamArgsLoop(Mount::ParamRow::ParamArg & args);
+	void ReadParamArgs(Mount::ParamRow::ParamArg & args);
 	void ReadParamName(std::string & res);
-	void ReadParam(std::string & res, Mount::ParamArg & args);
+	void ReadParam(std::string & res, Mount::ParamRow::ParamArg & args);
+	int FindIndex(const std::vector<std::string> * tab, const std::string & value);
 	void ReadMountType();
 	void ReadMountPoint();
 	void ReadFs();
@@ -55,7 +64,7 @@ private:
 	const char * pinput;
 	std::string temp;
 	std::string temp_arg;
-	Mount::ParamArg param_args;
+	Mount::ParamRow::ParamArg param_args;
 	
 	
 	Mount mount;
diff --git a/core/mounts.cpp b/core/mounts.cpp
index 7271129..a875052 100755
--- a/core/mounts.cpp
+++ b/core/mounts.cpp
@@ -2,7 +2,7 @@
  * This file is a part of Winix
  * and is not publicly distributed
  * 
- * Copyright (c) 2009, Tomasz Sowa
+ * Copyright (c) 2009-2010, Tomasz Sowa
  * All rights reserved.
  * 
  */
@@ -10,8 +10,8 @@
 #include "mounts.h"
 #include "request.h"
 #include "log.h"
-#include "mountparser.h"
 #include "db.h"
+#include "plugin.h"
 
 
 
@@ -22,6 +22,57 @@ Mounts::Mounts()
 }
 
 
+void Mounts::CreateMountType()
+{
+	mount_type_cms    = AddMountType("cms");
+	mount_type_thread = AddMountType("thread");
+	mount_type_ticket = AddMountType("ticket");
+}
+
+
+void Mounts::CreateMountFs()
+{
+	mount_fs_simplefs = AddMountFs("simplefs");
+	mount_fs_hashfs   = AddMountFs("hashfs");
+}
+
+
+void Mounts::CreateMountPar()
+{
+	mount_par_page						= AddMountPar("page");
+	mount_par_thread					= AddMountPar("thread");
+	mount_par_ticket					= AddMountPar("ticket");
+	mount_par_ticket_type				= AddMountPar("ticket_type");
+	mount_par_ticket_type_default		= AddMountPar("ticket_type_default");
+	mount_par_ticket_status				= AddMountPar("ticket_status");
+	mount_par_ticket_status_default		= AddMountPar("ticket_status_default");
+	mount_par_ticket_priority			= AddMountPar("ticket_priority");
+	mount_par_ticket_priority_default	= AddMountPar("ticket_priority_default");
+	mount_par_ticket_category			= AddMountPar("ticket_category");
+	mount_par_ticket_category_default	= AddMountPar("ticket_category_default");
+	mount_par_ticket_expected			= AddMountPar("ticket_expected");
+	mount_par_ticket_expected_default	= AddMountPar("ticket_expected_default");
+	mount_par_createthread_on			= AddMountPar("createthread_on");
+	mount_par_createticket_on			= AddMountPar("createticket_on");
+	mount_par_only_root_remove			= AddMountPar("only_root_remove");
+	mount_par_emacs_on					= AddMountPar("emacs_on");
+	mount_par_mkdir_on					= AddMountPar("mkdir_on");
+	mount_par_app						= AddMountPar("app");
+	mount_par_html_template				= AddMountPar("html_template");
+}
+
+
+void Mounts::CreateMounts()
+{
+	CreateMountType();
+	CreateMountFs();
+	CreateMountPar();
+
+	plugin.Call(WINIX_ADD_MOUNTS);
+}
+
+
+
 void Mounts::SetDirs(Dirs * pdirs)
 {
 	dirs = pdirs;
@@ -40,12 +91,86 @@ void Mounts::SetRequest(Request * prequest)
 
 
 
+int Mounts::AddMountType(const char * type)
+{
+	mount_type_tab.push_back(type);
+
+return static_cast<int>(mount_type_tab.size()) - 1;
+}
+
+
+int Mounts::AddMountType(const std::string & type)
+{
+	return AddMountType(type.c_str());
+}
+
+
+int Mounts::AddMountFs(const char * fs)
+{
+	mount_fs_tab.push_back(fs);
+
+return static_cast<int>(mount_fs_tab.size()) - 1;
+}
+
+
+const std::string & Mounts::GetMountType(int id)
+{
+	if( id < 0 || id >= (int)mount_type_tab.size() )
+		return empty_str;
+
+	return mount_type_tab[id];
+}
+
+
+int Mounts::AddMountFs(const std::string & fs)
+{
+	return AddMountFs(fs.c_str());
+}
+
+
+const std::string & Mounts::GetMountFs(int id)
+{
+	if( id < 0 || id >= (int)mount_fs_tab.size() )
+		return empty_str;
+
+	return mount_fs_tab[id];
+}
+
+
+int Mounts::AddMountPar(const char * par)
+{
+	mount_par_tab.push_back(par);
+
+return static_cast<int>(mount_par_tab.size()) - 1;
+}
+
+
+
+int Mounts::AddMountPar(const std::string & par)
+{
+	return AddMountPar(par.c_str());
+}
+
+
+const std::string & Mounts::GetMountPar(int id)
+{
+	if( id < 0 || id >= (int)mount_par_tab.size() )
+		return empty_str;
+
+	return mount_par_tab[id];
+}
+
+
+
 // reading from 'mounts'
 Error Mounts::ReadMounts(const std::string & mounts)
 {
-	MountParser mp;
-	mp.SetDirs(dirs);
-	Error err = mp.Parse(mounts, mount_tab);
+	mount_parser.SetDirs(dirs);
+	mount_parser.SetMountTypeTab(mount_type_tab);
+	mount_parser.SetMountFsTab(mount_fs_tab);
+	mount_parser.SetMountParTab(mount_par_tab);
+
+	Error err = mount_parser.Parse(mounts, mount_tab);
 
 	if( err != WINIX_ERR_OK )
 	{
@@ -95,8 +220,8 @@ Error Mounts::ReadMounts()
 void Mounts::MountCmsForRoot()
 {
 	Mount mount;
-	mount.type = Mount::cms;
-	mount.fs   = Mount::simplefs;
+	mount.type = MountTypeCms();
+	mount.fs   = MountFsSimplefs();
 
 	Item * proot = dirs->GetRootDir();
 	
@@ -131,8 +256,8 @@ std::vector<Item*>::reverse_iterator i;
 		if( m != mount_tab.end() )
 		{
 			pmount = &(m->second);
-			log << log2 << "M: current mount point is: " << pmount->TypeToStr()
-						<< ", fs: " << pmount->FsToStr() << logend;
+			log << log2 << "M: current mount point is: " << GetMountType(pmount->type)
+						<< ", fs: " << GetMountFs(pmount->fs) << logend;
 			return;	
 		}
 	}
@@ -140,8 +265,8 @@ std::vector<Item*>::reverse_iterator i;
 	// if nothing was found
 	// we assume that 'cms' mount point is used
 	MountCmsForRoot();
-	log << log2 << "M: current mount point is: " << pmount->TypeToStr() << " (default)"
-		<< ", fs: " << pmount->FsToStr() << logend;
+	log << log2 << "M: current mount point is: " << GetMountType(pmount->type) << " (default)"
+		<< ", fs: " << GetMountFs(pmount->fs) << logend;
 }
 
 
diff --git a/core/mounts.h b/core/mounts.h
index c13788f..8d9e604 100755
--- a/core/mounts.h
+++ b/core/mounts.h
@@ -2,7 +2,7 @@
  * This file is a part of Winix
  * and is not publicly distributed
  * 
- * Copyright (c) 2009, Tomasz Sowa
+ * Copyright (c) 2009-2010, Tomasz Sowa
  * All rights reserved.
  * 
  */
@@ -14,11 +14,13 @@
 
 #include <map>
 #include <string>
+#include <vector>
 #include "mount.h"
 #include "error.h"
 #include "dirs.h"
 #include "db.h"
 #include "request.h"
+#include "mountparser.h"
 
 
 
@@ -26,6 +28,60 @@ class Mounts
 {
 public:
 
+	/*
+		mount point's types
+	*/
+	int AddMountType(const char * type);
+	int AddMountType(const std::string & type);
+	const std::string & GetMountType(int id);
+
+	// id of a specific mount type (the id is always valid)
+	int MountTypeCms()    { return mount_type_cms; }
+	int MountTypeThread() { return mount_type_thread; } 
+	int MountTypeTicket() { return mount_type_ticket; }
+
+
+	/*
+		file systems
+	*/
+	int AddMountFs(const char * fs);
+	int AddMountFs(const std::string & fs);
+	const std::string & GetMountFs(int id);
+
+	// id of a specific file system (the id is always valid)
+	int MountFsSimplefs() { return mount_fs_simplefs; }
+	int MountFsHashfs()   { return mount_fs_hashfs; }
+
+
+	/*
+		mount point's parameters
+	*/
+	int AddMountPar(const char * par);
+	int AddMountPar(const std::string & par);
+	const std::string & GetMountPar(int id);
+
+	int MountParPage()					{ return mount_par_page; }
+	int MountParThread()				{ return mount_par_thread; }
+	int MountParTicket()				{ return mount_par_ticket; }
+	int MountParTicketType()			{ return mount_par_ticket_type; }
+	int MountParTicketTypeDefault()		{ return mount_par_ticket_type_default; }
+	int MountParTicketStatus()			{ return mount_par_ticket_status; }
+	int MountParTicketStatusDefault()	{ return mount_par_ticket_status_default; }
+	int MountParTicketPriority()		{ return mount_par_ticket_priority; }
+	int MountParTicketPriorityDefault() { return mount_par_ticket_priority_default; }
+	int MountParTicketCategory()		{ return mount_par_ticket_category; }
+	int MountParTicketCategoryDefault() { return mount_par_ticket_category_default; }
+	int MountParTicketExpected()		{ return mount_par_ticket_expected; }
+	int MountParTicketExpectedDefault() { return mount_par_ticket_expected_default; }
+	int MountParCreatethreadOn()		{ return mount_par_createthread_on; }
+	int MountParCreateticketOn()		{ return mount_par_createticket_on; }
+	int MountParOnlyRootRemove()		{ return mount_par_only_root_remove; }
+	int MountParEmacsOn()				{ return mount_par_emacs_on; }
+	int MountParMkdirOn()				{ return mount_par_mkdir_on; }
+	int MountParApp()					{ return mount_par_app; }
+	int MountParHtmlTemplate()			{ return mount_par_html_template; }
+
+
 	void SetDirs(Dirs * pdirs);
 	void SetDb(Db * pdb);
 	void SetRequest(Request * prequest);
@@ -34,6 +90,8 @@ public:
 	typedef std::map<long, Mount> MountTab;
 
 	Mounts();
+	void CreateMounts();
+
 	Error ReadMounts(const std::string & mounts);
 	Error ReadMounts();
 
@@ -53,8 +111,62 @@ private:
 	Db * db;
 	Request * request;
 
+	const std::string empty_str;
+
+	MountParser mount_parser;
+
+	// cms
+	// thread
+	// ticket
+	std::vector<std::string> mount_type_tab;
+
+	int mount_type_cms;
+	int mount_type_thread;
+	int mount_type_ticket;
+
+	// simplefs
+	// hashfs
+	std::vector<std::string> mount_fs_tab;
+	
+	int mount_fs_simplefs;
+	int mount_fs_hashfs;
+
+	// page
+	// thread
+	// ticket
+	// ticket_type
+	// ticket_type_default
+	// ...
+	std::vector<std::string> mount_par_tab;
+
+	int mount_par_page;
+	int mount_par_thread;
+	int mount_par_ticket;
+	int mount_par_ticket_type;
+	int mount_par_ticket_type_default;
+	int mount_par_ticket_status;
+	int mount_par_ticket_status_default;
+	int mount_par_ticket_priority;
+	int mount_par_ticket_priority_default;
+	int mount_par_ticket_category;
+	int mount_par_ticket_category_default;
+	int mount_par_ticket_expected;
+	int mount_par_ticket_expected_default;
+	int mount_par_createthread_on;
+	int mount_par_createticket_on;
+	int mount_par_only_root_remove;
+	int mount_par_emacs_on;
+	int mount_par_mkdir_on;
+	int mount_par_app;
+	int mount_par_html_template;
+	
+
 	MountTab mount_tab;
 
+	void CreateMountType();
+	void CreateMountFs();
+	void CreateMountPar();
+
 	void MountCmsForRoot();
 };
 
diff --git a/core/notify.cpp b/core/notify.cpp
index af935fb..4e05f2f 100755
--- a/core/notify.cpp
+++ b/core/notify.cpp
@@ -252,13 +252,14 @@ Users::Iterator i;
 		{
 			sending = false;
 	
-			if( system->mounts.pmount->type == Mount::thread || system->mounts.pmount->type == Mount::ticket )
+			if( system->mounts.pmount->type == system->mounts.MountTypeThread() ||
+				system->mounts.pmount->type == system->mounts.MountTypeTicket() )
 			{
 				if( (i->thread_notify & notify_code) != 0 )
 					sending = true;
 			}
 			else
-			if( system->mounts.pmount->type == Mount::cms )
+			if( system->mounts.pmount->type == system->mounts.MountTypeCms() )
 			{
 				if( (i->cms_notify & notify_code) != 0 )
 					sending = true;
diff --git a/core/pluginmsg.h b/core/pluginmsg.h
index fab0442..a0e8a11 100755
--- a/core/pluginmsg.h
+++ b/core/pluginmsg.h
@@ -48,7 +48,9 @@
 // now you can initialize your plugin
 #define WINIX_PLUGIN_INIT					3008	
 
-
+// here you can add your own mount point, file systems, mount parameters
+// for adding a new mount type call: system->mounts.AddMountType("new_mount_name")
+#define WINIX_ADD_MOUNTS					3009
 
 
 #endif
diff --git a/core/system.cpp b/core/system.cpp
index 2e363cf..8d7114f 100755
--- a/core/system.cpp
+++ b/core/system.cpp
@@ -46,6 +46,7 @@ void System::Init()
 	mounts.SetDirs(&dirs);
 	mounts.SetDb(db);
 	mounts.SetRequest(request);
+	mounts.CreateMounts();
 	mounts.ReadMounts();
 
 	users.SetRequest(request);
@@ -458,7 +459,7 @@ bool res;
 
 	Mount * pmount = mounts.CalcMount(item.parent_id);
 
-	if( !pmount || pmount->fs == Mount::simplefs )
+	if( !pmount || pmount->fs == mounts.MountFsSimplefs() )
 	{
 		res = MakePathSimpleFs(path, item.parent_id, create_dir);
 	}
diff --git a/functions/Makefile.dep b/functions/Makefile.dep
index efc603e..a6d677e 100755
--- a/functions/Makefile.dep
+++ b/functions/Makefile.dep
@@ -8,11 +8,12 @@ adduser.o: ../core/requesttypes.h ../core/session.h ../core/plugindata.h
 adduser.o: ../core/rebus.h ../core/config.h ../core/confparser.h
 adduser.o: ../core/htmlfilter.h ../core/config.h ../core/system.h
 adduser.o: ../core/dirs.h ../core/db.h ../core/request.h ../core/mounts.h
-adduser.o: ../core/mount.h ../core/users.h ../core/lastcontainer.h
-adduser.o: ../core/groups.h ../core/loadavg.h ../core/notify.h
-adduser.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
-adduser.o: ../core/mount.h ../core/locale.h ../templates/misc.h
-adduser.o: ../templates/localefilter.h ../core/locale.h ../core/system.h
+adduser.o: ../core/mount.h ../core/mountparser.h ../core/users.h
+adduser.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
+adduser.o: ../core/notify.h ../templatesnotify/templatesnotify.h
+adduser.o: ../../ezc/src/ezc.h ../core/mount.h ../core/locale.h
+adduser.o: ../templates/misc.h ../templates/localefilter.h ../core/locale.h
+adduser.o: ../core/system.h
 cat.o: cat.h functionbase.h ../core/item.h ../core/db.h ../core/item.h
 cat.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h
 cat.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h
@@ -20,12 +21,12 @@ cat.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h
 cat.o: ../core/session.h ../core/plugindata.h ../core/rebus.h
 cat.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
 cat.o: ../core/config.h ../core/system.h ../core/dirs.h ../core/db.h
-cat.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h
-cat.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
-cat.o: ../core/notify.h ../templatesnotify/templatesnotify.h
-cat.o: ../../ezc/src/ezc.h ../core/mount.h ../core/locale.h
-cat.o: ../templates/misc.h ../templates/localefilter.h ../core/locale.h
-cat.o: ../core/system.h
+cat.o: ../core/request.h ../core/mounts.h ../core/mount.h
+cat.o: ../core/mountparser.h ../core/users.h ../core/lastcontainer.h
+cat.o: ../core/groups.h ../core/loadavg.h ../core/notify.h
+cat.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
+cat.o: ../core/mount.h ../core/locale.h ../templates/misc.h
+cat.o: ../templates/localefilter.h ../core/locale.h ../core/system.h
 chmod.o: chmod.h functionbase.h ../core/item.h ../core/db.h ../core/item.h
 chmod.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h
 chmod.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h
@@ -33,12 +34,13 @@ chmod.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h
 chmod.o: ../core/session.h ../core/plugindata.h ../core/rebus.h
 chmod.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
 chmod.o: ../core/config.h ../core/system.h ../core/dirs.h ../core/db.h
-chmod.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h
-chmod.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
-chmod.o: ../core/notify.h ../templatesnotify/templatesnotify.h
-chmod.o: ../../ezc/src/ezc.h ../core/mount.h ../core/locale.h
-chmod.o: ../templates/misc.h ../templates/localefilter.h ../core/locale.h
-chmod.o: ../core/system.h privchanger.h
+chmod.o: ../core/request.h ../core/mounts.h ../core/mount.h
+chmod.o: ../core/mountparser.h ../core/users.h ../core/lastcontainer.h
+chmod.o: ../core/groups.h ../core/loadavg.h ../core/notify.h
+chmod.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
+chmod.o: ../core/mount.h ../core/locale.h ../templates/misc.h
+chmod.o: ../templates/localefilter.h ../core/locale.h ../core/system.h
+chmod.o: privchanger.h
 chown.o: chown.h functionbase.h ../core/item.h ../core/db.h ../core/item.h
 chown.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h
 chown.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h
@@ -46,12 +48,13 @@ chown.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h
 chown.o: ../core/session.h ../core/plugindata.h ../core/rebus.h
 chown.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
 chown.o: ../core/config.h ../core/system.h ../core/dirs.h ../core/db.h
-chown.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h
-chown.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
-chown.o: ../core/notify.h ../templatesnotify/templatesnotify.h
-chown.o: ../../ezc/src/ezc.h ../core/mount.h ../core/locale.h
-chown.o: ../templates/misc.h ../templates/localefilter.h ../core/locale.h
-chown.o: ../core/system.h privchanger.h
+chown.o: ../core/request.h ../core/mounts.h ../core/mount.h
+chown.o: ../core/mountparser.h ../core/users.h ../core/lastcontainer.h
+chown.o: ../core/groups.h ../core/loadavg.h ../core/notify.h
+chown.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
+chown.o: ../core/mount.h ../core/locale.h ../templates/misc.h
+chown.o: ../templates/localefilter.h ../core/locale.h ../core/system.h
+chown.o: privchanger.h
 ckeditor.o: ckeditor.h functionbase.h ../core/item.h ../core/db.h
 ckeditor.o: ../core/item.h ../core/user.h ../core/group.h ../core/thread.h
 ckeditor.o: ../core/error.h ../core/log.h ../core/dircontainer.h
@@ -60,13 +63,13 @@ ckeditor.o: ../core/requesttypes.h ../core/session.h ../core/plugindata.h
 ckeditor.o: ../core/rebus.h ../core/config.h ../core/confparser.h
 ckeditor.o: ../core/htmlfilter.h ../core/config.h ../core/system.h
 ckeditor.o: ../core/dirs.h ../core/db.h ../core/request.h ../core/mounts.h
-ckeditor.o: ../core/mount.h ../core/users.h ../core/lastcontainer.h
-ckeditor.o: ../core/groups.h ../core/loadavg.h ../core/notify.h
-ckeditor.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
-ckeditor.o: ../core/mount.h ../core/locale.h ../templates/misc.h
-ckeditor.o: ../templates/localefilter.h ../core/locale.h ../core/system.h
-ckeditor.o: functions.h functionparser.h adduser.h cat.h chmod.h
-ckeditor.o: privchanger.h chown.h cp.h createthread.h createticket.h
+ckeditor.o: ../core/mount.h ../core/mountparser.h ../core/users.h
+ckeditor.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
+ckeditor.o: ../core/notify.h ../templatesnotify/templatesnotify.h
+ckeditor.o: ../../ezc/src/ezc.h ../core/mount.h ../core/locale.h
+ckeditor.o: ../templates/misc.h ../templates/localefilter.h ../core/locale.h
+ckeditor.o: ../core/system.h functions.h functionparser.h adduser.h cat.h
+ckeditor.o: chmod.h privchanger.h chown.h cp.h createthread.h createticket.h
 ckeditor.o: default.h download.h editticket.h emacs.h last.h login.h logout.h
 ckeditor.o: ls.h mkdir.h mv.h node.h priv.h reload.h rm.h run.h subject.h
 ckeditor.o: funthread.h ../core/thread.h funticket.h ../core/ticket.h
@@ -79,7 +82,7 @@ cp.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h
 cp.o: ../core/session.h ../core/plugindata.h ../core/rebus.h ../core/config.h
 cp.o: ../core/confparser.h ../core/htmlfilter.h ../core/config.h
 cp.o: ../core/system.h ../core/dirs.h ../core/db.h ../core/request.h
-cp.o: ../core/mounts.h ../core/mount.h ../core/users.h
+cp.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h ../core/users.h
 cp.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
 cp.o: ../core/notify.h ../templatesnotify/templatesnotify.h
 cp.o: ../../ezc/src/ezc.h ../core/mount.h ../core/locale.h
@@ -99,8 +102,8 @@ createthread.o: ../core/plugindata.h ../core/rebus.h ../core/config.h
 createthread.o: ../core/confparser.h ../core/htmlfilter.h ../core/config.h
 createthread.o: ../core/system.h ../core/dirs.h ../core/db.h
 createthread.o: ../core/request.h ../core/mounts.h ../core/mount.h
-createthread.o: ../core/users.h ../core/lastcontainer.h ../core/groups.h
-createthread.o: ../core/loadavg.h ../core/notify.h
+createthread.o: ../core/mountparser.h ../core/users.h ../core/lastcontainer.h
+createthread.o: ../core/groups.h ../core/loadavg.h ../core/notify.h
 createthread.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
 createthread.o: ../core/mount.h ../core/locale.h ../templates/misc.h
 createthread.o: ../templates/localefilter.h ../core/locale.h ../core/system.h
@@ -120,8 +123,8 @@ createticket.o: ../core/plugindata.h ../core/rebus.h ../core/config.h
 createticket.o: ../core/confparser.h ../core/htmlfilter.h ../core/config.h
 createticket.o: ../core/system.h ../core/dirs.h ../core/db.h
 createticket.o: ../core/request.h ../core/mounts.h ../core/mount.h
-createticket.o: ../core/users.h ../core/lastcontainer.h ../core/groups.h
-createticket.o: ../core/loadavg.h ../core/notify.h
+createticket.o: ../core/mountparser.h ../core/users.h ../core/lastcontainer.h
+createticket.o: ../core/groups.h ../core/loadavg.h ../core/notify.h
 createticket.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
 createticket.o: ../core/mount.h ../core/locale.h ../templates/misc.h
 createticket.o: ../templates/localefilter.h ../core/locale.h ../core/system.h
@@ -140,11 +143,12 @@ default.o: ../core/requesttypes.h ../core/session.h ../core/plugindata.h
 default.o: ../core/rebus.h ../core/config.h ../core/confparser.h
 default.o: ../core/htmlfilter.h ../core/config.h ../core/system.h
 default.o: ../core/dirs.h ../core/db.h ../core/request.h ../core/mounts.h
-default.o: ../core/mount.h ../core/users.h ../core/lastcontainer.h
-default.o: ../core/groups.h ../core/loadavg.h ../core/notify.h
-default.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
-default.o: ../core/mount.h ../core/locale.h ../templates/misc.h
-default.o: ../templates/localefilter.h ../core/locale.h ../core/system.h
+default.o: ../core/mount.h ../core/mountparser.h ../core/users.h
+default.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
+default.o: ../core/notify.h ../templatesnotify/templatesnotify.h
+default.o: ../../ezc/src/ezc.h ../core/mount.h ../core/locale.h
+default.o: ../templates/misc.h ../templates/localefilter.h ../core/locale.h
+default.o: ../core/system.h
 download.o: download.h functionbase.h ../core/item.h ../core/db.h
 download.o: ../core/item.h ../core/user.h ../core/group.h ../core/thread.h
 download.o: ../core/error.h ../core/log.h ../core/dircontainer.h
@@ -153,11 +157,12 @@ download.o: ../core/requesttypes.h ../core/session.h ../core/plugindata.h
 download.o: ../core/rebus.h ../core/config.h ../core/confparser.h
 download.o: ../core/htmlfilter.h ../core/config.h ../core/system.h
 download.o: ../core/dirs.h ../core/db.h ../core/request.h ../core/mounts.h
-download.o: ../core/mount.h ../core/users.h ../core/lastcontainer.h
-download.o: ../core/groups.h ../core/loadavg.h ../core/notify.h
-download.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
-download.o: ../core/mount.h ../core/locale.h ../templates/misc.h
-download.o: ../templates/localefilter.h ../core/locale.h ../core/system.h
+download.o: ../core/mount.h ../core/mountparser.h ../core/users.h
+download.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
+download.o: ../core/notify.h ../templatesnotify/templatesnotify.h
+download.o: ../../ezc/src/ezc.h ../core/mount.h ../core/locale.h
+download.o: ../templates/misc.h ../templates/localefilter.h ../core/locale.h
+download.o: ../core/system.h
 editticket.o: editticket.h functionbase.h ../core/item.h ../core/db.h
 editticket.o: ../core/item.h ../core/user.h ../core/group.h ../core/thread.h
 editticket.o: ../core/error.h ../core/log.h ../core/dircontainer.h
@@ -166,18 +171,18 @@ editticket.o: ../core/requesttypes.h ../core/session.h ../core/plugindata.h
 editticket.o: ../core/rebus.h ../core/config.h ../core/confparser.h
 editticket.o: ../core/htmlfilter.h ../core/config.h ../core/system.h
 editticket.o: ../core/dirs.h ../core/db.h ../core/request.h ../core/mounts.h
-editticket.o: ../core/mount.h ../core/users.h ../core/lastcontainer.h
-editticket.o: ../core/groups.h ../core/loadavg.h ../core/notify.h
-editticket.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
-editticket.o: ../core/mount.h ../core/locale.h ../templates/misc.h
-editticket.o: ../templates/localefilter.h ../core/locale.h ../core/system.h
-editticket.o: functions.h functionparser.h adduser.h cat.h chmod.h
-editticket.o: privchanger.h chown.h ckeditor.h cp.h createthread.h
-editticket.o: createticket.h default.h download.h emacs.h last.h login.h
-editticket.o: logout.h ls.h mkdir.h mv.h node.h priv.h reload.h rm.h run.h
-editticket.o: subject.h funthread.h ../core/thread.h funticket.h
-editticket.o: ../core/ticket.h template.h tinymce.h uname.h upload.h uptime.h
-editticket.o: who.h ../core/htmlfilter.h readticket.h
+editticket.o: ../core/mount.h ../core/mountparser.h ../core/users.h
+editticket.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
+editticket.o: ../core/notify.h ../templatesnotify/templatesnotify.h
+editticket.o: ../../ezc/src/ezc.h ../core/mount.h ../core/locale.h
+editticket.o: ../templates/misc.h ../templates/localefilter.h
+editticket.o: ../core/locale.h ../core/system.h functions.h functionparser.h
+editticket.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h
+editticket.o: createthread.h createticket.h default.h download.h emacs.h
+editticket.o: last.h login.h logout.h ls.h mkdir.h mv.h node.h priv.h
+editticket.o: reload.h rm.h run.h subject.h funthread.h ../core/thread.h
+editticket.o: funticket.h ../core/ticket.h template.h tinymce.h uname.h
+editticket.o: upload.h uptime.h who.h ../core/htmlfilter.h readticket.h
 emacs.o: emacs.h functionbase.h ../core/item.h ../core/db.h ../core/item.h
 emacs.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h
 emacs.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h
@@ -185,15 +190,16 @@ emacs.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h
 emacs.o: ../core/session.h ../core/plugindata.h ../core/rebus.h
 emacs.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
 emacs.o: ../core/config.h ../core/system.h ../core/dirs.h ../core/db.h
-emacs.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h
-emacs.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
-emacs.o: ../core/notify.h ../templatesnotify/templatesnotify.h
-emacs.o: ../../ezc/src/ezc.h ../core/mount.h ../core/locale.h
-emacs.o: ../templates/misc.h ../templates/localefilter.h ../core/locale.h
-emacs.o: ../core/system.h ../templates/templates.h
-emacs.o: ../templates/patterncacher.h ../core/item.h ../templates/misc.h
-emacs.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h
-emacs.o: ../core/log.h ../templates/indexpatterns.h ../core/sessionmanager.h
+emacs.o: ../core/request.h ../core/mounts.h ../core/mount.h
+emacs.o: ../core/mountparser.h ../core/users.h ../core/lastcontainer.h
+emacs.o: ../core/groups.h ../core/loadavg.h ../core/notify.h
+emacs.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
+emacs.o: ../core/mount.h ../core/locale.h ../templates/misc.h
+emacs.o: ../templates/localefilter.h ../core/locale.h ../core/system.h
+emacs.o: ../templates/templates.h ../templates/patterncacher.h ../core/item.h
+emacs.o: ../templates/misc.h ../templates/ckeditorgetparser.h
+emacs.o: ../core/httpsimpleparser.h ../core/log.h
+emacs.o: ../templates/indexpatterns.h ../core/sessionmanager.h
 emacs.o: ../core/sessioncontainer.h functions.h functionparser.h adduser.h
 emacs.o: cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h createthread.h
 emacs.o: createticket.h default.h download.h editticket.h last.h login.h
@@ -209,19 +215,19 @@ functionbase.o: ../core/requesttypes.h ../core/session.h ../core/plugindata.h
 functionbase.o: ../core/rebus.h ../core/config.h ../core/confparser.h
 functionbase.o: ../core/htmlfilter.h ../core/config.h ../core/system.h
 functionbase.o: ../core/dirs.h ../core/db.h ../core/request.h
-functionbase.o: ../core/mounts.h ../core/mount.h ../core/users.h
-functionbase.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
-functionbase.o: ../core/notify.h ../templatesnotify/templatesnotify.h
-functionbase.o: ../../ezc/src/ezc.h ../core/mount.h ../core/locale.h
-functionbase.o: ../templates/misc.h ../templates/localefilter.h
-functionbase.o: ../core/locale.h ../core/system.h functions.h
-functionbase.o: functionparser.h adduser.h cat.h chmod.h privchanger.h
-functionbase.o: chown.h ckeditor.h cp.h createthread.h createticket.h
-functionbase.o: default.h download.h editticket.h emacs.h last.h login.h
-functionbase.o: logout.h ls.h mkdir.h mv.h node.h priv.h reload.h rm.h run.h
-functionbase.o: subject.h funthread.h ../core/thread.h funticket.h
-functionbase.o: ../core/ticket.h template.h tinymce.h uname.h upload.h
-functionbase.o: uptime.h who.h ../core/htmlfilter.h
+functionbase.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h
+functionbase.o: ../core/users.h ../core/lastcontainer.h ../core/groups.h
+functionbase.o: ../core/loadavg.h ../core/notify.h
+functionbase.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
+functionbase.o: ../core/mount.h ../core/locale.h ../templates/misc.h
+functionbase.o: ../templates/localefilter.h ../core/locale.h ../core/system.h
+functionbase.o: functions.h functionparser.h adduser.h cat.h chmod.h
+functionbase.o: privchanger.h chown.h ckeditor.h cp.h createthread.h
+functionbase.o: createticket.h default.h download.h editticket.h emacs.h
+functionbase.o: last.h login.h logout.h ls.h mkdir.h mv.h node.h priv.h
+functionbase.o: reload.h rm.h run.h subject.h funthread.h ../core/thread.h
+functionbase.o: funticket.h ../core/ticket.h template.h tinymce.h uname.h
+functionbase.o: upload.h uptime.h who.h ../core/htmlfilter.h
 functionparser.o: functionparser.h ../core/request.h ../core/requesttypes.h
 functionparser.o: ../core/session.h ../core/item.h ../core/error.h
 functionparser.o: ../core/log.h ../core/user.h ../core/plugindata.h
@@ -230,20 +236,20 @@ functionparser.o: ../core/htmlfilter.h ../core/db.h ../core/group.h
 functionparser.o: ../core/thread.h ../core/dircontainer.h
 functionparser.o: ../core/ugcontainer.h ../core/ticket.h ../core/system.h
 functionparser.o: ../core/dirs.h ../core/db.h ../core/request.h
-functionparser.o: ../core/mounts.h ../core/mount.h ../core/users.h
-functionparser.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
-functionparser.o: ../core/log.h ../core/item.h ../core/error.h functions.h
-functionparser.o: functionbase.h ../core/config.h ../core/notify.h
-functionparser.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
-functionparser.o: ../core/mount.h ../core/locale.h ../templates/misc.h
-functionparser.o: ../templates/localefilter.h ../core/locale.h
-functionparser.o: ../core/system.h adduser.h cat.h chmod.h privchanger.h
-functionparser.o: chown.h ckeditor.h cp.h createthread.h createticket.h
-functionparser.o: default.h download.h editticket.h emacs.h last.h login.h
-functionparser.o: logout.h ls.h mkdir.h mv.h node.h priv.h reload.h rm.h
-functionparser.o: run.h subject.h funthread.h ../core/thread.h funticket.h
-functionparser.o: ../core/ticket.h template.h tinymce.h uname.h upload.h
-functionparser.o: uptime.h who.h ../core/htmlfilter.h
+functionparser.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h
+functionparser.o: ../core/users.h ../core/lastcontainer.h ../core/groups.h
+functionparser.o: ../core/loadavg.h ../core/log.h ../core/item.h
+functionparser.o: ../core/error.h functions.h functionbase.h ../core/config.h
+functionparser.o: ../core/notify.h ../templatesnotify/templatesnotify.h
+functionparser.o: ../../ezc/src/ezc.h ../core/mount.h ../core/locale.h
+functionparser.o: ../templates/misc.h ../templates/localefilter.h
+functionparser.o: ../core/locale.h ../core/system.h adduser.h cat.h chmod.h
+functionparser.o: privchanger.h chown.h ckeditor.h cp.h createthread.h
+functionparser.o: createticket.h default.h download.h editticket.h emacs.h
+functionparser.o: last.h login.h logout.h ls.h mkdir.h mv.h node.h priv.h
+functionparser.o: reload.h rm.h run.h subject.h funthread.h ../core/thread.h
+functionparser.o: funticket.h ../core/ticket.h template.h tinymce.h uname.h
+functionparser.o: upload.h uptime.h who.h ../core/htmlfilter.h
 functions.o: functions.h functionbase.h ../core/item.h ../core/db.h
 functions.o: ../core/item.h ../core/user.h ../core/group.h ../core/thread.h
 functions.o: ../core/error.h ../core/log.h ../core/dircontainer.h
@@ -252,18 +258,18 @@ functions.o: ../core/requesttypes.h ../core/session.h ../core/plugindata.h
 functions.o: ../core/rebus.h ../core/config.h ../core/confparser.h
 functions.o: ../core/htmlfilter.h ../core/config.h ../core/system.h
 functions.o: ../core/dirs.h ../core/db.h ../core/request.h ../core/mounts.h
-functions.o: ../core/mount.h ../core/users.h ../core/lastcontainer.h
-functions.o: ../core/groups.h ../core/loadavg.h ../core/notify.h
-functions.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
-functions.o: ../core/mount.h ../core/locale.h ../templates/misc.h
-functions.o: ../templates/localefilter.h ../core/locale.h ../core/system.h
-functions.o: functionparser.h adduser.h cat.h chmod.h privchanger.h chown.h
-functions.o: ckeditor.h cp.h createthread.h createticket.h default.h
-functions.o: download.h editticket.h emacs.h last.h login.h logout.h ls.h
-functions.o: mkdir.h mv.h node.h priv.h reload.h rm.h run.h subject.h
-functions.o: funthread.h ../core/thread.h funticket.h ../core/ticket.h
-functions.o: template.h tinymce.h uname.h upload.h uptime.h who.h
-functions.o: ../core/htmlfilter.h ../core/log.h ../core/misc.h
+functions.o: ../core/mount.h ../core/mountparser.h ../core/users.h
+functions.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
+functions.o: ../core/notify.h ../templatesnotify/templatesnotify.h
+functions.o: ../../ezc/src/ezc.h ../core/mount.h ../core/locale.h
+functions.o: ../templates/misc.h ../templates/localefilter.h ../core/locale.h
+functions.o: ../core/system.h functionparser.h adduser.h cat.h chmod.h
+functions.o: privchanger.h chown.h ckeditor.h cp.h createthread.h
+functions.o: createticket.h default.h download.h editticket.h emacs.h last.h
+functions.o: login.h logout.h ls.h mkdir.h mv.h node.h priv.h reload.h rm.h
+functions.o: run.h subject.h funthread.h ../core/thread.h funticket.h
+functions.o: ../core/ticket.h template.h tinymce.h uname.h upload.h uptime.h
+functions.o: who.h ../core/htmlfilter.h ../core/log.h ../core/misc.h
 functions.o: ../templates/templates.h ../templates/patterncacher.h
 functions.o: ../core/item.h ../templates/misc.h
 functions.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h
@@ -277,12 +283,12 @@ funthread.o: ../core/requesttypes.h ../core/session.h ../core/plugindata.h
 funthread.o: ../core/rebus.h ../core/config.h ../core/confparser.h
 funthread.o: ../core/htmlfilter.h ../core/config.h ../core/system.h
 funthread.o: ../core/dirs.h ../core/db.h ../core/request.h ../core/mounts.h
-funthread.o: ../core/mount.h ../core/users.h ../core/lastcontainer.h
-funthread.o: ../core/groups.h ../core/loadavg.h ../core/notify.h
-funthread.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
-funthread.o: ../core/mount.h ../core/locale.h ../templates/misc.h
-funthread.o: ../templates/localefilter.h ../core/locale.h ../core/system.h
-funthread.o: ../core/thread.h
+funthread.o: ../core/mount.h ../core/mountparser.h ../core/users.h
+funthread.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
+funthread.o: ../core/notify.h ../templatesnotify/templatesnotify.h
+funthread.o: ../../ezc/src/ezc.h ../core/mount.h ../core/locale.h
+funthread.o: ../templates/misc.h ../templates/localefilter.h ../core/locale.h
+funthread.o: ../core/system.h ../core/thread.h
 funticket.o: funticket.h functionbase.h ../core/item.h ../core/db.h
 funticket.o: ../core/item.h ../core/user.h ../core/group.h ../core/thread.h
 funticket.o: ../core/error.h ../core/log.h ../core/dircontainer.h
@@ -291,12 +297,12 @@ funticket.o: ../core/requesttypes.h ../core/session.h ../core/plugindata.h
 funticket.o: ../core/rebus.h ../core/config.h ../core/confparser.h
 funticket.o: ../core/htmlfilter.h ../core/config.h ../core/system.h
 funticket.o: ../core/dirs.h ../core/db.h ../core/request.h ../core/mounts.h
-funticket.o: ../core/mount.h ../core/users.h ../core/lastcontainer.h
-funticket.o: ../core/groups.h ../core/loadavg.h ../core/notify.h
-funticket.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
-funticket.o: ../core/mount.h ../core/locale.h ../templates/misc.h
-funticket.o: ../templates/localefilter.h ../core/locale.h ../core/system.h
-funticket.o: ../core/ticket.h
+funticket.o: ../core/mount.h ../core/mountparser.h ../core/users.h
+funticket.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
+funticket.o: ../core/notify.h ../templatesnotify/templatesnotify.h
+funticket.o: ../../ezc/src/ezc.h ../core/mount.h ../core/locale.h
+funticket.o: ../templates/misc.h ../templates/localefilter.h ../core/locale.h
+funticket.o: ../core/system.h ../core/ticket.h
 last.o: last.h functionbase.h ../core/item.h ../core/db.h ../core/item.h
 last.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h
 last.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h
@@ -304,12 +310,12 @@ last.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h
 last.o: ../core/session.h ../core/plugindata.h ../core/rebus.h
 last.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
 last.o: ../core/config.h ../core/system.h ../core/dirs.h ../core/db.h
-last.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h
-last.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
-last.o: ../core/notify.h ../templatesnotify/templatesnotify.h
-last.o: ../../ezc/src/ezc.h ../core/mount.h ../core/locale.h
-last.o: ../templates/misc.h ../templates/localefilter.h ../core/locale.h
-last.o: ../core/system.h
+last.o: ../core/request.h ../core/mounts.h ../core/mount.h
+last.o: ../core/mountparser.h ../core/users.h ../core/lastcontainer.h
+last.o: ../core/groups.h ../core/loadavg.h ../core/notify.h
+last.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
+last.o: ../core/mount.h ../core/locale.h ../templates/misc.h
+last.o: ../templates/localefilter.h ../core/locale.h ../core/system.h
 login.o: login.h functionbase.h ../core/item.h ../core/db.h ../core/item.h
 login.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h
 login.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h
@@ -317,12 +323,12 @@ login.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h
 login.o: ../core/session.h ../core/plugindata.h ../core/rebus.h
 login.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
 login.o: ../core/config.h ../core/system.h ../core/dirs.h ../core/db.h
-login.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h
-login.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
-login.o: ../core/notify.h ../templatesnotify/templatesnotify.h
-login.o: ../../ezc/src/ezc.h ../core/mount.h ../core/locale.h
-login.o: ../templates/misc.h ../templates/localefilter.h ../core/locale.h
-login.o: ../core/system.h
+login.o: ../core/request.h ../core/mounts.h ../core/mount.h
+login.o: ../core/mountparser.h ../core/users.h ../core/lastcontainer.h
+login.o: ../core/groups.h ../core/loadavg.h ../core/notify.h
+login.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
+login.o: ../core/mount.h ../core/locale.h ../templates/misc.h
+login.o: ../templates/localefilter.h ../core/locale.h ../core/system.h
 logout.o: logout.h functionbase.h ../core/item.h ../core/db.h ../core/item.h
 logout.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h
 logout.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h
@@ -330,12 +336,12 @@ logout.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h
 logout.o: ../core/session.h ../core/plugindata.h ../core/rebus.h
 logout.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
 logout.o: ../core/config.h ../core/system.h ../core/dirs.h ../core/db.h
-logout.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h
-logout.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
-logout.o: ../core/notify.h ../templatesnotify/templatesnotify.h
-logout.o: ../../ezc/src/ezc.h ../core/mount.h ../core/locale.h
-logout.o: ../templates/misc.h ../templates/localefilter.h ../core/locale.h
-logout.o: ../core/system.h
+logout.o: ../core/request.h ../core/mounts.h ../core/mount.h
+logout.o: ../core/mountparser.h ../core/users.h ../core/lastcontainer.h
+logout.o: ../core/groups.h ../core/loadavg.h ../core/notify.h
+logout.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
+logout.o: ../core/mount.h ../core/locale.h ../templates/misc.h
+logout.o: ../templates/localefilter.h ../core/locale.h ../core/system.h
 ls.o: ls.h functionbase.h ../core/item.h ../core/db.h ../core/item.h
 ls.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h
 ls.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h
@@ -343,7 +349,7 @@ ls.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h
 ls.o: ../core/session.h ../core/plugindata.h ../core/rebus.h ../core/config.h
 ls.o: ../core/confparser.h ../core/htmlfilter.h ../core/config.h
 ls.o: ../core/system.h ../core/dirs.h ../core/db.h ../core/request.h
-ls.o: ../core/mounts.h ../core/mount.h ../core/users.h
+ls.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h ../core/users.h
 ls.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
 ls.o: ../core/notify.h ../templatesnotify/templatesnotify.h
 ls.o: ../../ezc/src/ezc.h ../core/mount.h ../core/locale.h
@@ -356,18 +362,18 @@ mkdir.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h
 mkdir.o: ../core/session.h ../core/plugindata.h ../core/rebus.h
 mkdir.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
 mkdir.o: ../core/config.h ../core/system.h ../core/dirs.h ../core/db.h
-mkdir.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h
-mkdir.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
-mkdir.o: ../core/notify.h ../templatesnotify/templatesnotify.h
-mkdir.o: ../../ezc/src/ezc.h ../core/mount.h ../core/locale.h
-mkdir.o: ../templates/misc.h ../templates/localefilter.h ../core/locale.h
-mkdir.o: ../core/system.h functions.h functionparser.h adduser.h cat.h
-mkdir.o: chmod.h privchanger.h chown.h ckeditor.h cp.h createthread.h
-mkdir.o: createticket.h default.h download.h editticket.h emacs.h last.h
-mkdir.o: login.h logout.h ls.h mv.h node.h priv.h reload.h rm.h run.h
-mkdir.o: subject.h funthread.h ../core/thread.h funticket.h ../core/ticket.h
-mkdir.o: template.h tinymce.h uname.h upload.h uptime.h who.h
-mkdir.o: ../core/htmlfilter.h
+mkdir.o: ../core/request.h ../core/mounts.h ../core/mount.h
+mkdir.o: ../core/mountparser.h ../core/users.h ../core/lastcontainer.h
+mkdir.o: ../core/groups.h ../core/loadavg.h ../core/notify.h
+mkdir.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
+mkdir.o: ../core/mount.h ../core/locale.h ../templates/misc.h
+mkdir.o: ../templates/localefilter.h ../core/locale.h ../core/system.h
+mkdir.o: functions.h functionparser.h adduser.h cat.h chmod.h privchanger.h
+mkdir.o: chown.h ckeditor.h cp.h createthread.h createticket.h default.h
+mkdir.o: download.h editticket.h emacs.h last.h login.h logout.h ls.h mv.h
+mkdir.o: node.h priv.h reload.h rm.h run.h subject.h funthread.h
+mkdir.o: ../core/thread.h funticket.h ../core/ticket.h template.h tinymce.h
+mkdir.o: uname.h upload.h uptime.h who.h ../core/htmlfilter.h
 mv.o: mv.h functionbase.h ../core/item.h ../core/db.h ../core/item.h
 mv.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h
 mv.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h
@@ -375,7 +381,7 @@ mv.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h
 mv.o: ../core/session.h ../core/plugindata.h ../core/rebus.h ../core/config.h
 mv.o: ../core/confparser.h ../core/htmlfilter.h ../core/config.h
 mv.o: ../core/system.h ../core/dirs.h ../core/db.h ../core/request.h
-mv.o: ../core/mounts.h ../core/mount.h ../core/users.h
+mv.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h ../core/users.h
 mv.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
 mv.o: ../core/notify.h ../templatesnotify/templatesnotify.h
 mv.o: ../../ezc/src/ezc.h ../core/mount.h ../core/locale.h
@@ -393,12 +399,12 @@ node.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h
 node.o: ../core/session.h ../core/plugindata.h ../core/rebus.h
 node.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
 node.o: ../core/config.h ../core/system.h ../core/dirs.h ../core/db.h
-node.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h
-node.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
-node.o: ../core/notify.h ../templatesnotify/templatesnotify.h
-node.o: ../../ezc/src/ezc.h ../core/mount.h ../core/locale.h
-node.o: ../templates/misc.h ../templates/localefilter.h ../core/locale.h
-node.o: ../core/system.h
+node.o: ../core/request.h ../core/mounts.h ../core/mount.h
+node.o: ../core/mountparser.h ../core/users.h ../core/lastcontainer.h
+node.o: ../core/groups.h ../core/loadavg.h ../core/notify.h
+node.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
+node.o: ../core/mount.h ../core/locale.h ../templates/misc.h
+node.o: ../templates/localefilter.h ../core/locale.h ../core/system.h
 priv.o: priv.h functionbase.h ../core/item.h ../core/db.h ../core/item.h
 priv.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h
 priv.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h
@@ -406,31 +412,32 @@ priv.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h
 priv.o: ../core/session.h ../core/plugindata.h ../core/rebus.h
 priv.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
 priv.o: ../core/config.h ../core/system.h ../core/dirs.h ../core/db.h
-priv.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h
-priv.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
-priv.o: ../core/notify.h ../templatesnotify/templatesnotify.h
-priv.o: ../../ezc/src/ezc.h ../core/mount.h ../core/locale.h
-priv.o: ../templates/misc.h ../templates/localefilter.h ../core/locale.h
-priv.o: ../core/system.h privchanger.h
+priv.o: ../core/request.h ../core/mounts.h ../core/mount.h
+priv.o: ../core/mountparser.h ../core/users.h ../core/lastcontainer.h
+priv.o: ../core/groups.h ../core/loadavg.h ../core/notify.h
+priv.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
+priv.o: ../core/mount.h ../core/locale.h ../templates/misc.h
+priv.o: ../templates/localefilter.h ../core/locale.h ../core/system.h
+priv.o: privchanger.h
 privchanger.o: privchanger.h ../core/request.h ../core/requesttypes.h
 privchanger.o: ../core/session.h ../core/item.h ../core/error.h ../core/log.h
 privchanger.o: ../core/user.h ../core/plugindata.h ../core/rebus.h
 privchanger.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
 privchanger.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
 privchanger.o: ../core/db.h ../core/request.h ../core/mounts.h
-privchanger.o: ../core/mount.h ../core/users.h ../core/ugcontainer.h
-privchanger.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h
-privchanger.o: ../core/loadavg.h ../core/db.h ../core/thread.h
-privchanger.o: ../core/ticket.h
+privchanger.o: ../core/mount.h ../core/mountparser.h ../core/users.h
+privchanger.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
+privchanger.o: ../core/group.h ../core/loadavg.h ../core/db.h
+privchanger.o: ../core/thread.h ../core/ticket.h
 readticket.o: readticket.h ../core/request.h ../core/requesttypes.h
 readticket.o: ../core/session.h ../core/item.h ../core/error.h ../core/log.h
 readticket.o: ../core/user.h ../core/plugindata.h ../core/rebus.h
 readticket.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
 readticket.o: ../core/ticket.h ../core/system.h ../core/dirs.h
 readticket.o: ../core/dircontainer.h ../core/db.h ../core/request.h
-readticket.o: ../core/mounts.h ../core/mount.h ../core/users.h
-readticket.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
-readticket.o: ../core/group.h ../core/loadavg.h
+readticket.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h
+readticket.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
+readticket.o: ../core/groups.h ../core/group.h ../core/loadavg.h
 reload.o: reload.h functionbase.h ../core/item.h ../core/db.h ../core/item.h
 reload.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h
 reload.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h
@@ -438,15 +445,16 @@ reload.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h
 reload.o: ../core/session.h ../core/plugindata.h ../core/rebus.h
 reload.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
 reload.o: ../core/config.h ../core/system.h ../core/dirs.h ../core/db.h
-reload.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h
-reload.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
-reload.o: ../core/notify.h ../templatesnotify/templatesnotify.h
-reload.o: ../../ezc/src/ezc.h ../core/mount.h ../core/locale.h
-reload.o: ../templates/misc.h ../templates/localefilter.h ../core/locale.h
-reload.o: ../core/system.h ../templates/templates.h
-reload.o: ../templates/patterncacher.h ../core/item.h ../templates/misc.h
-reload.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h
-reload.o: ../core/log.h ../templates/indexpatterns.h ../core/sessionmanager.h
+reload.o: ../core/request.h ../core/mounts.h ../core/mount.h
+reload.o: ../core/mountparser.h ../core/users.h ../core/lastcontainer.h
+reload.o: ../core/groups.h ../core/loadavg.h ../core/notify.h
+reload.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
+reload.o: ../core/mount.h ../core/locale.h ../templates/misc.h
+reload.o: ../templates/localefilter.h ../core/locale.h ../core/system.h
+reload.o: ../templates/templates.h ../templates/patterncacher.h
+reload.o: ../core/item.h ../templates/misc.h ../templates/ckeditorgetparser.h
+reload.o: ../core/httpsimpleparser.h ../core/log.h
+reload.o: ../templates/indexpatterns.h ../core/sessionmanager.h
 reload.o: ../core/sessioncontainer.h
 rm.o: rm.h functionbase.h ../core/item.h ../core/db.h ../core/item.h
 rm.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h
@@ -455,7 +463,7 @@ rm.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h
 rm.o: ../core/session.h ../core/plugindata.h ../core/rebus.h ../core/config.h
 rm.o: ../core/confparser.h ../core/htmlfilter.h ../core/config.h
 rm.o: ../core/system.h ../core/dirs.h ../core/db.h ../core/request.h
-rm.o: ../core/mounts.h ../core/mount.h ../core/users.h
+rm.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h ../core/users.h
 rm.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
 rm.o: ../core/notify.h ../templatesnotify/templatesnotify.h
 rm.o: ../../ezc/src/ezc.h ../core/mount.h ../core/locale.h
@@ -479,12 +487,12 @@ run.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h
 run.o: ../core/session.h ../core/plugindata.h ../core/rebus.h
 run.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
 run.o: ../core/config.h ../core/system.h ../core/dirs.h ../core/db.h
-run.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h
-run.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
-run.o: ../core/notify.h ../templatesnotify/templatesnotify.h
-run.o: ../../ezc/src/ezc.h ../core/mount.h ../core/locale.h
-run.o: ../templates/misc.h ../templates/localefilter.h ../core/locale.h
-run.o: ../core/system.h
+run.o: ../core/request.h ../core/mounts.h ../core/mount.h
+run.o: ../core/mountparser.h ../core/users.h ../core/lastcontainer.h
+run.o: ../core/groups.h ../core/loadavg.h ../core/notify.h
+run.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
+run.o: ../core/mount.h ../core/locale.h ../templates/misc.h
+run.o: ../templates/localefilter.h ../core/locale.h ../core/system.h
 subject.o: subject.h functionbase.h ../core/item.h ../core/db.h
 subject.o: ../core/item.h ../core/user.h ../core/group.h ../core/thread.h
 subject.o: ../core/error.h ../core/log.h ../core/dircontainer.h
@@ -493,11 +501,12 @@ subject.o: ../core/requesttypes.h ../core/session.h ../core/plugindata.h
 subject.o: ../core/rebus.h ../core/config.h ../core/confparser.h
 subject.o: ../core/htmlfilter.h ../core/config.h ../core/system.h
 subject.o: ../core/dirs.h ../core/db.h ../core/request.h ../core/mounts.h
-subject.o: ../core/mount.h ../core/users.h ../core/lastcontainer.h
-subject.o: ../core/groups.h ../core/loadavg.h ../core/notify.h
-subject.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
-subject.o: ../core/mount.h ../core/locale.h ../templates/misc.h
-subject.o: ../templates/localefilter.h ../core/locale.h ../core/system.h
+subject.o: ../core/mount.h ../core/mountparser.h ../core/users.h
+subject.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
+subject.o: ../core/notify.h ../templatesnotify/templatesnotify.h
+subject.o: ../../ezc/src/ezc.h ../core/mount.h ../core/locale.h
+subject.o: ../templates/misc.h ../templates/localefilter.h ../core/locale.h
+subject.o: ../core/system.h
 template.o: template.h functionbase.h ../core/item.h ../core/db.h
 template.o: ../core/item.h ../core/user.h ../core/group.h ../core/thread.h
 template.o: ../core/error.h ../core/log.h ../core/dircontainer.h
@@ -506,12 +515,12 @@ template.o: ../core/requesttypes.h ../core/session.h ../core/plugindata.h
 template.o: ../core/rebus.h ../core/config.h ../core/confparser.h
 template.o: ../core/htmlfilter.h ../core/config.h ../core/system.h
 template.o: ../core/dirs.h ../core/db.h ../core/request.h ../core/mounts.h
-template.o: ../core/mount.h ../core/users.h ../core/lastcontainer.h
-template.o: ../core/groups.h ../core/loadavg.h ../core/notify.h
-template.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
-template.o: ../core/mount.h ../core/locale.h ../templates/misc.h
-template.o: ../templates/localefilter.h ../core/locale.h ../core/system.h
-template.o: ../core/misc.h
+template.o: ../core/mount.h ../core/mountparser.h ../core/users.h
+template.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
+template.o: ../core/notify.h ../templatesnotify/templatesnotify.h
+template.o: ../../ezc/src/ezc.h ../core/mount.h ../core/locale.h
+template.o: ../templates/misc.h ../templates/localefilter.h ../core/locale.h
+template.o: ../core/system.h ../core/misc.h
 tinymce.o: tinymce.h functionbase.h ../core/item.h ../core/db.h
 tinymce.o: ../core/item.h ../core/user.h ../core/group.h ../core/thread.h
 tinymce.o: ../core/error.h ../core/log.h ../core/dircontainer.h
@@ -520,17 +529,18 @@ tinymce.o: ../core/requesttypes.h ../core/session.h ../core/plugindata.h
 tinymce.o: ../core/rebus.h ../core/config.h ../core/confparser.h
 tinymce.o: ../core/htmlfilter.h ../core/config.h ../core/system.h
 tinymce.o: ../core/dirs.h ../core/db.h ../core/request.h ../core/mounts.h
-tinymce.o: ../core/mount.h ../core/users.h ../core/lastcontainer.h
-tinymce.o: ../core/groups.h ../core/loadavg.h ../core/notify.h
-tinymce.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
-tinymce.o: ../core/mount.h ../core/locale.h ../templates/misc.h
-tinymce.o: ../templates/localefilter.h ../core/locale.h ../core/system.h
-tinymce.o: functions.h functionparser.h adduser.h cat.h chmod.h privchanger.h
-tinymce.o: chown.h ckeditor.h cp.h createthread.h createticket.h default.h
-tinymce.o: download.h editticket.h emacs.h last.h login.h logout.h ls.h
-tinymce.o: mkdir.h mv.h node.h priv.h reload.h rm.h run.h subject.h
-tinymce.o: funthread.h ../core/thread.h funticket.h ../core/ticket.h
-tinymce.o: template.h uname.h upload.h uptime.h who.h ../core/htmlfilter.h
+tinymce.o: ../core/mount.h ../core/mountparser.h ../core/users.h
+tinymce.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
+tinymce.o: ../core/notify.h ../templatesnotify/templatesnotify.h
+tinymce.o: ../../ezc/src/ezc.h ../core/mount.h ../core/locale.h
+tinymce.o: ../templates/misc.h ../templates/localefilter.h ../core/locale.h
+tinymce.o: ../core/system.h functions.h functionparser.h adduser.h cat.h
+tinymce.o: chmod.h privchanger.h chown.h ckeditor.h cp.h createthread.h
+tinymce.o: createticket.h default.h download.h editticket.h emacs.h last.h
+tinymce.o: login.h logout.h ls.h mkdir.h mv.h node.h priv.h reload.h rm.h
+tinymce.o: run.h subject.h funthread.h ../core/thread.h funticket.h
+tinymce.o: ../core/ticket.h template.h uname.h upload.h uptime.h who.h
+tinymce.o: ../core/htmlfilter.h
 uname.o: uname.h functionbase.h ../core/item.h ../core/db.h ../core/item.h
 uname.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h
 uname.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h
@@ -538,12 +548,12 @@ uname.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h
 uname.o: ../core/session.h ../core/plugindata.h ../core/rebus.h
 uname.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
 uname.o: ../core/config.h ../core/system.h ../core/dirs.h ../core/db.h
-uname.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h
-uname.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
-uname.o: ../core/notify.h ../templatesnotify/templatesnotify.h
-uname.o: ../../ezc/src/ezc.h ../core/mount.h ../core/locale.h
-uname.o: ../templates/misc.h ../templates/localefilter.h ../core/locale.h
-uname.o: ../core/system.h
+uname.o: ../core/request.h ../core/mounts.h ../core/mount.h
+uname.o: ../core/mountparser.h ../core/users.h ../core/lastcontainer.h
+uname.o: ../core/groups.h ../core/loadavg.h ../core/notify.h
+uname.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
+uname.o: ../core/mount.h ../core/locale.h ../templates/misc.h
+uname.o: ../templates/localefilter.h ../core/locale.h ../core/system.h
 upload.o: upload.h functionbase.h ../core/item.h ../core/db.h ../core/item.h
 upload.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h
 upload.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h
@@ -551,18 +561,19 @@ upload.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h
 upload.o: ../core/session.h ../core/plugindata.h ../core/rebus.h
 upload.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
 upload.o: ../core/config.h ../core/system.h ../core/dirs.h ../core/db.h
-upload.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h
-upload.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
-upload.o: ../core/notify.h ../templatesnotify/templatesnotify.h
-upload.o: ../../ezc/src/ezc.h ../core/mount.h ../core/locale.h
-upload.o: ../templates/misc.h ../templates/localefilter.h ../core/locale.h
-upload.o: ../core/system.h ../core/misc.h ../functions/functions.h
-upload.o: functionparser.h adduser.h cat.h chmod.h privchanger.h chown.h
-upload.o: ckeditor.h cp.h createthread.h createticket.h default.h download.h
-upload.o: editticket.h emacs.h last.h login.h logout.h ls.h mkdir.h mv.h
-upload.o: node.h priv.h reload.h rm.h run.h subject.h funthread.h
-upload.o: ../core/thread.h funticket.h ../core/ticket.h template.h tinymce.h
-upload.o: uname.h uptime.h who.h ../core/htmlfilter.h
+upload.o: ../core/request.h ../core/mounts.h ../core/mount.h
+upload.o: ../core/mountparser.h ../core/users.h ../core/lastcontainer.h
+upload.o: ../core/groups.h ../core/loadavg.h ../core/notify.h
+upload.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
+upload.o: ../core/mount.h ../core/locale.h ../templates/misc.h
+upload.o: ../templates/localefilter.h ../core/locale.h ../core/system.h
+upload.o: ../core/misc.h ../functions/functions.h functionparser.h adduser.h
+upload.o: cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h createthread.h
+upload.o: createticket.h default.h download.h editticket.h emacs.h last.h
+upload.o: login.h logout.h ls.h mkdir.h mv.h node.h priv.h reload.h rm.h
+upload.o: run.h subject.h funthread.h ../core/thread.h funticket.h
+upload.o: ../core/ticket.h template.h tinymce.h uname.h uptime.h who.h
+upload.o: ../core/htmlfilter.h
 uptime.o: uptime.h functionbase.h ../core/item.h ../core/db.h ../core/item.h
 uptime.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h
 uptime.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h
@@ -570,12 +581,12 @@ uptime.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h
 uptime.o: ../core/session.h ../core/plugindata.h ../core/rebus.h
 uptime.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
 uptime.o: ../core/config.h ../core/system.h ../core/dirs.h ../core/db.h
-uptime.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h
-uptime.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
-uptime.o: ../core/notify.h ../templatesnotify/templatesnotify.h
-uptime.o: ../../ezc/src/ezc.h ../core/mount.h ../core/locale.h
-uptime.o: ../templates/misc.h ../templates/localefilter.h ../core/locale.h
-uptime.o: ../core/system.h
+uptime.o: ../core/request.h ../core/mounts.h ../core/mount.h
+uptime.o: ../core/mountparser.h ../core/users.h ../core/lastcontainer.h
+uptime.o: ../core/groups.h ../core/loadavg.h ../core/notify.h
+uptime.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
+uptime.o: ../core/mount.h ../core/locale.h ../templates/misc.h
+uptime.o: ../templates/localefilter.h ../core/locale.h ../core/system.h
 who.o: who.h functionbase.h ../core/item.h ../core/db.h ../core/item.h
 who.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h
 who.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h
@@ -583,9 +594,9 @@ who.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h
 who.o: ../core/session.h ../core/plugindata.h ../core/rebus.h
 who.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
 who.o: ../core/config.h ../core/system.h ../core/dirs.h ../core/db.h
-who.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h
-who.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
-who.o: ../core/notify.h ../templatesnotify/templatesnotify.h
-who.o: ../../ezc/src/ezc.h ../core/mount.h ../core/locale.h
-who.o: ../templates/misc.h ../templates/localefilter.h ../core/locale.h
-who.o: ../core/system.h
+who.o: ../core/request.h ../core/mounts.h ../core/mount.h
+who.o: ../core/mountparser.h ../core/users.h ../core/lastcontainer.h
+who.o: ../core/groups.h ../core/loadavg.h ../core/notify.h
+who.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
+who.o: ../core/mount.h ../core/locale.h ../templates/misc.h
+who.o: ../templates/localefilter.h ../core/locale.h ../core/system.h
diff --git a/functions/createthread.cpp b/functions/createthread.cpp
index cbe5c17..1acc5a2 100755
--- a/functions/createthread.cpp
+++ b/functions/createthread.cpp
@@ -34,17 +34,17 @@ bool CreateThread::HasAccess(bool check_root)
 	if( !system->HasWriteAccess(*request->dir_tab.back()) )
 		return false;
 	
-	if( !system->mounts.pmount || system->mounts.pmount->type != Mount::thread )
+	if( !system->mounts.pmount || system->mounts.pmount->type != system->mounts.MountTypeThread() )
 		return false;
 	
 	if( !check_root && request->session && request->session->puser && request->session->puser->super_user )
 		// super can create thread regardless of the restrictcreatethread option
 		return true;
 
-	if( !system->mounts.pmount->IsPar(Mount::par_createthread_on) )
+	if( !system->mounts.pmount->IsPar(system->mounts.MountParCreatethreadOn()) )
 		return true;
 		
-	if( system->mounts.pmount->IsArg(Mount::par_createthread_on, request->dir_tab.size()) )
+	if( system->mounts.pmount->IsArg(system->mounts.MountParCreatethreadOn(), request->dir_tab.size()) )
 		return true;
 
 return false;
diff --git a/functions/createticket.cpp b/functions/createticket.cpp
index 5b890df..d0434ab 100755
--- a/functions/createticket.cpp
+++ b/functions/createticket.cpp
@@ -38,7 +38,7 @@ bool CreateTicket::HasAccess(bool check_root)
 	if( !system->HasWriteAccess(*request->dir_tab.back()) )
 		return false;
 	
-	if( !system->mounts.pmount || system->mounts.pmount->type != Mount::ticket )
+	if( !system->mounts.pmount || system->mounts.pmount->type != system->mounts.MountTypeTicket() )
 		return false;
 	
 
@@ -48,10 +48,10 @@ bool CreateTicket::HasAccess(bool check_root)
 		// super can create tickets regardless of the createticket_on option
 		return true;
 
-	if( !system->mounts.pmount->IsPar(Mount::par_createticket_on) )
+	if( !system->mounts.pmount->IsPar(system->mounts.MountParCreateticketOn()) )
 		return true;
 
-	if( system->mounts.pmount->IsArg(Mount::par_createticket_on, request->dir_tab.size()) )
+	if( system->mounts.pmount->IsArg(system->mounts.MountParCreateticketOn(), request->dir_tab.size()) )
 		return true;
 
 return false;
diff --git a/functions/editticket.cpp b/functions/editticket.cpp
index d6d1fa4..7c5b34f 100755
--- a/functions/editticket.cpp
+++ b/functions/editticket.cpp
@@ -46,7 +46,7 @@ bool EditTicket::HasAccess()
 	if( !system->HasWriteAccess(*request->dir_tab.back()) )
 		return false;
 	
-	if( !system->mounts.pmount || system->mounts.pmount->type != Mount::ticket )
+	if( !system->mounts.pmount || system->mounts.pmount->type != system->mounts.MountTypeTicket() )
 		return false;
 
 return true;
diff --git a/functions/emacs.cpp b/functions/emacs.cpp
index 25f0ef4..a23784e 100755
--- a/functions/emacs.cpp
+++ b/functions/emacs.cpp
@@ -32,10 +32,10 @@ bool Emacs::HasAccess(const Item & item)
 	if( !system->HasWriteAccess(item) )
 		return false;
 
-	if( !system->mounts.pmount->IsPar(Mount::par_emacs_on) )
+	if( !system->mounts.pmount->IsPar(system->mounts.MountParEmacsOn()) )
 		return true;
 
-	if( system->mounts.pmount->IsArg(Mount::par_emacs_on, request->dir_tab.size()) )
+	if( system->mounts.pmount->IsArg(system->mounts.MountParEmacsOn(), request->dir_tab.size()) )
 		return true;	
 	
 return false;
@@ -77,7 +77,7 @@ return true;
 
 void Emacs::PostFunEmacsModifyMountPoint(bool adding)
 {
-	if( system->mounts.pmount->type == Mount::thread )
+	if( system->mounts.pmount->type == system->mounts.MountTypeThread() )
 	{
 		if( adding )
 			db->EditThreadAddItem(request->dir_tab.back()->id, request->item.id);
@@ -85,13 +85,13 @@ void Emacs::PostFunEmacsModifyMountPoint(bool adding)
 		system->RedirectToLastDir();
 	}
 	else
-	if( system->mounts.pmount->type == Mount::ticket )
+	if( system->mounts.pmount->type == system->mounts.MountTypeTicket() )
 	{
 		system->RedirectToLastDir();
 	}
 	else
 	{
-		// Mount::cms
+		// system->mounts.MountTypeCms()
 		system->RedirectTo(request->item);
 	}
 }
diff --git a/functions/functions.cpp b/functions/functions.cpp
index 0a08b33..b8ec0e2 100755
--- a/functions/functions.cpp
+++ b/functions/functions.cpp
@@ -238,13 +238,13 @@ void Functions::SetDefaultFunctionForDir()
 	}
 
 	
-	if( system->mounts.pmount->type == Mount::thread )
+	if( system->mounts.pmount->type == system->mounts.MountTypeThread() )
 	{
 		request->function = &fun_thread;
 		log << log3 << "Content: default function: " << request->function->fun.url << logend;
 	}
 	else
-	if( system->mounts.pmount->type == Mount::ticket )
+	if( system->mounts.pmount->type == system->mounts.MountTypeTicket() )
 	{
 		request->function = &fun_ticket;
 		log << log3 << "Content: default function: " << request->function->fun.url << logend;
diff --git a/functions/funthread.cpp b/functions/funthread.cpp
index cd198f9..313abce 100755
--- a/functions/funthread.cpp
+++ b/functions/funthread.cpp
@@ -64,7 +64,7 @@ void FunThread::MakeGet()
 
 	Db::ItemQuery iq;
 
-	if( system->mounts.pmount->IsArg(Mount::par_thread, "sort_desc") )
+	if( system->mounts.pmount->IsArg(system->mounts.MountParThread(), "sort_desc") )
 		iq.sort_asc = false;
 
 	iq.WhereParentId(request->dir_tab.back()->id);
diff --git a/functions/funticket.cpp b/functions/funticket.cpp
index 49f985c..dabdef3 100755
--- a/functions/funticket.cpp
+++ b/functions/funticket.cpp
@@ -22,7 +22,7 @@ FunTicket::FunTicket()
 
 bool FunTicket::HasAccess()
 {
-	if( request->is_item || system->mounts.pmount->type != Mount::ticket )
+	if( request->is_item || system->mounts.pmount->type != system->mounts.MountTypeTicket() )
 		return false;
 
 return true;
diff --git a/functions/mkdir.cpp b/functions/mkdir.cpp
index fe66d37..236b465 100755
--- a/functions/mkdir.cpp
+++ b/functions/mkdir.cpp
@@ -37,10 +37,10 @@ bool Mkdir::HasAccess(const Item & item)
 	if( !system->HasWriteAccess(item) )
 		return false;
 
-	if( !system->mounts.pmount->IsPar(Mount::par_mkdir_on) )
+	if( !system->mounts.pmount->IsPar(system->mounts.MountParMkdirOn()) )
 		return true;
 
-	if( system->mounts.pmount->IsArg(Mount::par_mkdir_on, request->dir_tab.size()) )
+	if( system->mounts.pmount->IsArg(system->mounts.MountParMkdirOn(), request->dir_tab.size()) )
 		return true;	
 	
 return false;
diff --git a/functions/mv.cpp b/functions/mv.cpp
index a5ddf86..21a2cf8 100755
--- a/functions/mv.cpp
+++ b/functions/mv.cpp
@@ -110,7 +110,7 @@ bool Mv::MoveCheckMountPoints(long dir_id)
 	
 	if( !new_mount )
 	{
-		if( system->mounts.pmount->type != Mount::cms )
+		if( system->mounts.pmount->type != system->mounts.MountTypeCms() )
 		{
 			request->status = WINIX_DIFFERENT_MOUNT_POINTS;
 			return false;
diff --git a/functions/readticket.cpp b/functions/readticket.cpp
index 11e28e1..224e5d0 100755
--- a/functions/readticket.cpp
+++ b/functions/readticket.cpp
@@ -28,8 +28,8 @@ static std::string temp;
 	request->PostVar("type", temp);
 	ticket->type = atoi(temp.c_str());
 
-	if( ticket->type >= system->mounts.pmount->param[Mount::par_ticket_type].arg.size() )
-		ticket->type = system->mounts.pmount->param[Mount::par_ticket_type].arg.size();
+	if( ticket->type >= system->mounts.pmount->param[system->mounts.MountParTicketType()].arg.size() )
+		ticket->type = system->mounts.pmount->param[system->mounts.MountParTicketType()].arg.size();
 }
 
 
@@ -41,8 +41,8 @@ static std::string temp;
 	request->PostVar("status", temp);
 	ticket->status = atoi(temp.c_str());
 
-	if( ticket->status >= system->mounts.pmount->param[Mount::par_ticket_status].arg.size() )
-		ticket->status = system->mounts.pmount->param[Mount::par_ticket_status].arg.size();
+	if( ticket->status >= system->mounts.pmount->param[system->mounts.MountParTicketStatus()].arg.size() )
+		ticket->status = system->mounts.pmount->param[system->mounts.MountParTicketStatus()].arg.size();
 }
 
 
@@ -54,8 +54,8 @@ static std::string temp;
 	request->PostVar("priority", temp);
 	ticket->priority = atoi(temp.c_str());
 
-	if( ticket->priority >= system->mounts.pmount->param[Mount::par_ticket_priority].arg.size() )
-		ticket->priority = system->mounts.pmount->param[Mount::par_ticket_priority].arg.size();
+	if( ticket->priority >= system->mounts.pmount->param[system->mounts.MountParTicketPriority()].arg.size() )
+		ticket->priority = system->mounts.pmount->param[system->mounts.MountParTicketPriority()].arg.size();
 }
 
 
@@ -67,8 +67,8 @@ static std::string temp;
 	request->PostVar("category", temp);
 	ticket->category = atoi(temp.c_str());
 
-	if( ticket->category >= system->mounts.pmount->param[Mount::par_ticket_category].arg.size() )
-		ticket->category = system->mounts.pmount->param[Mount::par_ticket_category].arg.size();
+	if( ticket->category >= system->mounts.pmount->param[system->mounts.MountParTicketCategory()].arg.size() )
+		ticket->category = system->mounts.pmount->param[system->mounts.MountParTicketCategory()].arg.size();
 }
 
 
@@ -79,8 +79,8 @@ static std::string temp;
 	request->PostVar("expected", temp);
 	ticket->expected = atoi(temp.c_str());
 
-	if( ticket->expected >= system->mounts.pmount->param[Mount::par_ticket_expected].arg.size() )
-		ticket->expected = system->mounts.pmount->param[Mount::par_ticket_expected].arg.size();
+	if( ticket->expected >= system->mounts.pmount->param[system->mounts.MountParTicketExpected()].arg.size() )
+		ticket->expected = system->mounts.pmount->param[system->mounts.MountParTicketExpected()].arg.size();
 }
 
 
diff --git a/functions/rm.cpp b/functions/rm.cpp
index 5675ebb..9c404c0 100755
--- a/functions/rm.cpp
+++ b/functions/rm.cpp
@@ -51,7 +51,7 @@ bool Rm::HasAccess(const Item & item)
 			return false;
 	}
 
-	if( system->mounts.pmount->IsPar(Mount::par_only_root_remove) )
+	if( system->mounts.pmount->IsPar(system->mounts.MountParOnlyRootRemove()) )
 		if( !request->session->puser || !request->session->puser->super_user )
 			return false;
 	
@@ -205,10 +205,10 @@ void Rm::RemoveFile()
 		
 		plugin.Call(WINIX_FILE_REMOVED, request->item.id);
 
-		if( system->mounts.pmount->type == Mount::thread )
+		if( system->mounts.pmount->type == system->mounts.MountTypeThread() )
 			db->EditThreadRemoveItem(request->item.parent_id);
 		else
-		if( system->mounts.pmount->type == Mount::ticket )
+		if( system->mounts.pmount->type == system->mounts.MountTypeTicket() )
 			db->EditTicketRemoveItem(request->item.id);
 
 		if( request->item.auth != Item::auth_none )
diff --git a/functions/template.cpp b/functions/template.cpp
index d16a1a0..74fb6ea 100755
--- a/functions/template.cpp
+++ b/functions/template.cpp
@@ -69,7 +69,7 @@ void Template::CreateTemplateFileName(const std::string & index_str)
 	else
 	{
 		index -= 1;		
-		Mount::ParamRow & par = system->mounts.pmount->param[Mount::par_html_template];
+		Mount::ParamRow & par = system->mounts.pmount->param[system->mounts.MountParHtmlTemplate()];
 		
 		if( !par.defined || (size_t)index >= par.arg.size() )
 			html_template.clear();
diff --git a/functions/upload.cpp b/functions/upload.cpp
index 800d2a1..42616bb 100755
--- a/functions/upload.cpp
+++ b/functions/upload.cpp
@@ -38,13 +38,13 @@ bool Upload::HasAccess(const Item & item)
 	if( !system->mounts.pmount )
 		return false;
 
-	if( system->mounts.pmount->fs == Mount::simplefs && config->auth_simplefs_dir.empty() )
+	if( system->mounts.pmount->fs == system->mounts.MountFsSimplefs() && config->auth_simplefs_dir.empty() )
 	{
 		log << log1 << "Request: can't use upload function, auth_simplefs_dir must be set in the config file" << logend;
 		return false;
 	}
 
-	if( system->mounts.pmount->fs == Mount::hashfs && config->auth_hashfs_dir.empty() )
+	if( system->mounts.pmount->fs == system->mounts.MountFsHashfs() && config->auth_hashfs_dir.empty() )
 	{
 		log << log1 << "Request: can't use upload function, auth_hashfs_dir must be set in the config file" << logend;
 		return false;
diff --git a/main/Makefile.dep b/main/Makefile.dep
index 2d60063..0f75b1a 100755
--- a/main/Makefile.dep
+++ b/main/Makefile.dep
@@ -6,14 +6,14 @@ main.o: ../core/dircontainer.h ../core/db.h ../core/user.h ../core/group.h
 main.o: ../core/thread.h ../core/error.h ../core/log.h ../core/ugcontainer.h
 main.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h
 main.o: ../core/session.h ../core/plugindata.h ../core/rebus.h
-main.o: ../core/mounts.h ../core/mount.h ../core/users.h
-main.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
-main.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/notify.h
-main.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
-main.o: ../core/mount.h ../core/locale.h ../core/config.h ../templates/misc.h
-main.o: ../templates/localefilter.h ../core/locale.h ../functions/functions.h
-main.o: ../functions/functionbase.h ../core/item.h ../core/db.h
-main.o: ../core/request.h ../core/system.h ../core/notify.h
+main.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h
+main.o: ../core/users.h ../core/lastcontainer.h ../core/groups.h
+main.o: ../core/loadavg.h ../core/sessionmanager.h ../core/sessioncontainer.h
+main.o: ../core/notify.h ../templatesnotify/templatesnotify.h
+main.o: ../../ezc/src/ezc.h ../core/mount.h ../core/locale.h ../core/config.h
+main.o: ../templates/misc.h ../templates/localefilter.h ../core/locale.h
+main.o: ../functions/functions.h ../functions/functionbase.h ../core/item.h
+main.o: ../core/db.h ../core/request.h ../core/system.h ../core/notify.h
 main.o: ../functions/functionparser.h ../functions/adduser.h
 main.o: ../functions/cat.h ../functions/chmod.h ../functions/privchanger.h
 main.o: ../functions/chown.h ../functions/ckeditor.h ../functions/cp.h
diff --git a/plugins/stats/Makefile.dep b/plugins/stats/Makefile.dep
index c805c95..c53797b 100755
--- a/plugins/stats/Makefile.dep
+++ b/plugins/stats/Makefile.dep
@@ -11,27 +11,27 @@ init.o: ../../core/ugcontainer.h ../../core/ticket.h bot.h stats.h
 init.o: templates.h ../../core/plugin.h ../../core/pluginmsg.h
 init.o: ../../core/request.h ../../core/system.h ../../core/dirs.h
 init.o: ../../core/db.h ../../core/mounts.h ../../core/mount.h
-init.o: ../../core/users.h ../../core/lastcontainer.h ../../core/groups.h
-init.o: ../../core/loadavg.h ../../core/sessionmanager.h
-init.o: ../../core/sessioncontainer.h ../../functions/functions.h
-init.o: ../../functions/functionbase.h ../../core/item.h ../../core/system.h
-init.o: ../../core/notify.h ../../templatesnotify/templatesnotify.h
-init.o: ../../../ezc/src/ezc.h ../../core/mount.h ../../core/locale.h
-init.o: ../../templates/misc.h ../../templates/localefilter.h
-init.o: ../../core/locale.h ../../functions/functionparser.h
-init.o: ../../functions/adduser.h ../../functions/cat.h
-init.o: ../../functions/chmod.h ../../functions/privchanger.h
-init.o: ../../functions/chown.h ../../functions/ckeditor.h
-init.o: ../../functions/cp.h ../../functions/createthread.h
-init.o: ../../functions/createticket.h ../../functions/default.h
-init.o: ../../functions/download.h ../../functions/editticket.h
-init.o: ../../functions/emacs.h ../../functions/last.h
-init.o: ../../functions/login.h ../../functions/logout.h ../../functions/ls.h
-init.o: ../../functions/mkdir.h ../../functions/mv.h ../../functions/node.h
-init.o: ../../functions/priv.h ../../functions/reload.h ../../functions/rm.h
-init.o: ../../functions/run.h ../../functions/subject.h
-init.o: ../../functions/funthread.h ../../core/thread.h
-init.o: ../../functions/funticket.h ../../core/ticket.h
+init.o: ../../core/mountparser.h ../../core/users.h
+init.o: ../../core/lastcontainer.h ../../core/groups.h ../../core/loadavg.h
+init.o: ../../core/sessionmanager.h ../../core/sessioncontainer.h
+init.o: ../../functions/functions.h ../../functions/functionbase.h
+init.o: ../../core/item.h ../../core/system.h ../../core/notify.h
+init.o: ../../templatesnotify/templatesnotify.h ../../../ezc/src/ezc.h
+init.o: ../../core/mount.h ../../core/locale.h ../../templates/misc.h
+init.o: ../../templates/localefilter.h ../../core/locale.h
+init.o: ../../functions/functionparser.h ../../functions/adduser.h
+init.o: ../../functions/cat.h ../../functions/chmod.h
+init.o: ../../functions/privchanger.h ../../functions/chown.h
+init.o: ../../functions/ckeditor.h ../../functions/cp.h
+init.o: ../../functions/createthread.h ../../functions/createticket.h
+init.o: ../../functions/default.h ../../functions/download.h
+init.o: ../../functions/editticket.h ../../functions/emacs.h
+init.o: ../../functions/last.h ../../functions/login.h
+init.o: ../../functions/logout.h ../../functions/ls.h ../../functions/mkdir.h
+init.o: ../../functions/mv.h ../../functions/node.h ../../functions/priv.h
+init.o: ../../functions/reload.h ../../functions/rm.h ../../functions/run.h
+init.o: ../../functions/subject.h ../../functions/funthread.h
+init.o: ../../core/thread.h ../../functions/funticket.h ../../core/ticket.h
 init.o: ../../functions/template.h ../../functions/tinymce.h
 init.o: ../../functions/uname.h ../../functions/upload.h
 init.o: ../../functions/uptime.h ../../functions/who.h
@@ -48,13 +48,14 @@ templates.o: ../../core/confparser.h ../../core/htmlfilter.h
 templates.o: ../../core/request.h ../../core/system.h ../../core/dirs.h
 templates.o: ../../core/item.h ../../core/dircontainer.h ../../core/db.h
 templates.o: ../../core/mounts.h ../../core/mount.h ../../core/error.h
-templates.o: ../../core/users.h ../../core/user.h ../../core/ugcontainer.h
-templates.o: ../../core/lastcontainer.h ../../core/groups.h
-templates.o: ../../core/group.h ../../core/rebus.h ../../core/loadavg.h
-templates.o: ../../core/sessionmanager.h ../../core/sessioncontainer.h
-templates.o: ../../core/session.h ../../functions/functions.h
-templates.o: ../../functions/functionbase.h ../../core/item.h ../../core/db.h
-templates.o: ../../core/thread.h ../../core/ticket.h ../../core/request.h
+templates.o: ../../core/mountparser.h ../../core/users.h ../../core/user.h
+templates.o: ../../core/ugcontainer.h ../../core/lastcontainer.h
+templates.o: ../../core/groups.h ../../core/group.h ../../core/rebus.h
+templates.o: ../../core/loadavg.h ../../core/sessionmanager.h
+templates.o: ../../core/sessioncontainer.h ../../core/session.h
+templates.o: ../../functions/functions.h ../../functions/functionbase.h
+templates.o: ../../core/item.h ../../core/db.h ../../core/thread.h
+templates.o: ../../core/ticket.h ../../core/request.h
 templates.o: ../../core/requesttypes.h ../../core/config.h
 templates.o: ../../core/system.h ../../core/notify.h
 templates.o: ../../templatesnotify/templatesnotify.h ../../../ezc/src/ezc.h
diff --git a/templates/Makefile.dep b/templates/Makefile.dep
index 878b2de..860af55 100755
--- a/templates/Makefile.dep
+++ b/templates/Makefile.dep
@@ -10,10 +10,10 @@ adduser.o: ../core/user.h ../core/plugindata.h ../core/rebus.h
 adduser.o: ../core/config.h ../core/db.h ../core/group.h ../core/thread.h
 adduser.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/ticket.h
 adduser.o: ../core/system.h ../core/dirs.h ../core/db.h ../core/request.h
-adduser.o: ../core/mounts.h ../core/mount.h ../core/users.h
-adduser.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
-adduser.o: ../core/sessionmanager.h ../core/sessioncontainer.h
-adduser.o: ../core/system.h
+adduser.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h
+adduser.o: ../core/users.h ../core/lastcontainer.h ../core/groups.h
+adduser.o: ../core/loadavg.h ../core/sessionmanager.h
+adduser.o: ../core/sessioncontainer.h ../core/system.h
 dir.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h misc.h
 dir.o: localefilter.h ../core/locale.h ../core/confparser.h
 dir.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
@@ -24,11 +24,11 @@ dir.o: ../core/plugindata.h ../core/rebus.h ../core/config.h ../core/db.h
 dir.o: ../core/group.h ../core/thread.h ../core/dircontainer.h
 dir.o: ../core/ugcontainer.h ../core/ticket.h ../core/system.h ../core/dirs.h
 dir.o: ../core/db.h ../core/request.h ../core/mounts.h ../core/mount.h
-dir.o: ../core/users.h ../core/lastcontainer.h ../core/groups.h
-dir.o: ../core/loadavg.h ../core/sessionmanager.h ../core/sessioncontainer.h
-dir.o: ../core/system.h ../core/misc.h ../functions/functions.h
-dir.o: ../functions/functionbase.h ../core/item.h ../core/notify.h
-dir.o: ../templatesnotify/templatesnotify.h ../core/mount.h
+dir.o: ../core/mountparser.h ../core/users.h ../core/lastcontainer.h
+dir.o: ../core/groups.h ../core/loadavg.h ../core/sessionmanager.h
+dir.o: ../core/sessioncontainer.h ../core/system.h ../core/misc.h
+dir.o: ../functions/functions.h ../functions/functionbase.h ../core/item.h
+dir.o: ../core/notify.h ../templatesnotify/templatesnotify.h ../core/mount.h
 dir.o: ../templates/misc.h ../functions/functionparser.h
 dir.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h
 dir.o: ../functions/privchanger.h ../functions/chown.h
@@ -53,9 +53,10 @@ doc.o: ../core/plugindata.h ../core/rebus.h ../core/config.h ../core/db.h
 doc.o: ../core/group.h ../core/thread.h ../core/dircontainer.h
 doc.o: ../core/ugcontainer.h ../core/ticket.h ../core/system.h ../core/dirs.h
 doc.o: ../core/db.h ../core/request.h ../core/mounts.h ../core/mount.h
-doc.o: ../core/users.h ../core/lastcontainer.h ../core/groups.h
-doc.o: ../core/loadavg.h ../core/sessionmanager.h ../core/sessioncontainer.h
-doc.o: ../core/system.h ../core/request.h ../core/misc.h
+doc.o: ../core/mountparser.h ../core/users.h ../core/lastcontainer.h
+doc.o: ../core/groups.h ../core/loadavg.h ../core/sessionmanager.h
+doc.o: ../core/sessioncontainer.h ../core/system.h ../core/request.h
+doc.o: ../core/misc.h
 indexpatterns.o: indexpatterns.h ../../ezc/src/ezc.h localefilter.h
 indexpatterns.o: ../core/locale.h ../core/confparser.h ../core/locale.h
 indexpatterns.o: ../core/config.h ../core/htmlfilter.h ../core/log.h
@@ -69,10 +70,10 @@ item.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/config.h
 item.o: ../core/db.h ../core/group.h ../core/thread.h ../core/dircontainer.h
 item.o: ../core/ugcontainer.h ../core/ticket.h ../core/system.h
 item.o: ../core/dirs.h ../core/db.h ../core/request.h ../core/mounts.h
-item.o: ../core/mount.h ../core/users.h ../core/lastcontainer.h
-item.o: ../core/groups.h ../core/loadavg.h ../core/sessionmanager.h
-item.o: ../core/sessioncontainer.h ../core/system.h ../core/request.h
-item.o: ../core/misc.h ../core/bbcodeparser.h
+item.o: ../core/mount.h ../core/mountparser.h ../core/users.h
+item.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
+item.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h
+item.o: ../core/request.h ../core/misc.h ../core/bbcodeparser.h
 last.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h misc.h
 last.o: localefilter.h ../core/locale.h ../core/confparser.h
 last.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
@@ -83,10 +84,10 @@ last.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/config.h
 last.o: ../core/db.h ../core/group.h ../core/thread.h ../core/dircontainer.h
 last.o: ../core/ugcontainer.h ../core/ticket.h ../core/system.h
 last.o: ../core/dirs.h ../core/db.h ../core/request.h ../core/mounts.h
-last.o: ../core/mount.h ../core/users.h ../core/lastcontainer.h
-last.o: ../core/groups.h ../core/loadavg.h ../core/sessionmanager.h
-last.o: ../core/sessioncontainer.h ../core/system.h ../core/lastcontainer.h
-last.o: ../core/request.h ../core/misc.h
+last.o: ../core/mount.h ../core/mountparser.h ../core/users.h
+last.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
+last.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h
+last.o: ../core/lastcontainer.h ../core/request.h ../core/misc.h
 localefilter.o: localefilter.h ../core/locale.h ../core/confparser.h
 localefilter.o: ../../ezc/src/ezc.h ../core/misc.h ../core/item.h
 ls.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h misc.h
@@ -99,9 +100,9 @@ ls.o: ../core/plugindata.h ../core/rebus.h ../core/config.h ../core/db.h
 ls.o: ../core/group.h ../core/thread.h ../core/dircontainer.h
 ls.o: ../core/ugcontainer.h ../core/ticket.h ../core/system.h ../core/dirs.h
 ls.o: ../core/db.h ../core/request.h ../core/mounts.h ../core/mount.h
-ls.o: ../core/users.h ../core/lastcontainer.h ../core/groups.h
-ls.o: ../core/loadavg.h ../core/sessionmanager.h ../core/sessioncontainer.h
-ls.o: ../core/system.h ../core/request.h
+ls.o: ../core/mountparser.h ../core/users.h ../core/lastcontainer.h
+ls.o: ../core/groups.h ../core/loadavg.h ../core/sessionmanager.h
+ls.o: ../core/sessioncontainer.h ../core/system.h ../core/request.h
 misc.o: ../core/misc.h ../core/item.h ../core/request.h templates.h
 misc.o: ../../ezc/src/ezc.h patterncacher.h ../core/item.h misc.h
 misc.o: localefilter.h ../core/locale.h ../core/confparser.h
@@ -113,9 +114,9 @@ misc.o: ../core/plugindata.h ../core/rebus.h ../core/config.h ../core/db.h
 misc.o: ../core/group.h ../core/thread.h ../core/dircontainer.h
 misc.o: ../core/ugcontainer.h ../core/ticket.h ../core/system.h
 misc.o: ../core/dirs.h ../core/db.h ../core/request.h ../core/mounts.h
-misc.o: ../core/mount.h ../core/users.h ../core/lastcontainer.h
-misc.o: ../core/groups.h ../core/loadavg.h ../core/sessionmanager.h
-misc.o: ../core/sessioncontainer.h ../core/system.h
+misc.o: ../core/mount.h ../core/mountparser.h ../core/users.h
+misc.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
+misc.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h
 mount.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h
 mount.o: misc.h localefilter.h ../core/locale.h ../core/confparser.h
 mount.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
@@ -126,9 +127,10 @@ mount.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/config.h
 mount.o: ../core/db.h ../core/group.h ../core/thread.h ../core/dircontainer.h
 mount.o: ../core/ugcontainer.h ../core/ticket.h ../core/system.h
 mount.o: ../core/dirs.h ../core/db.h ../core/request.h ../core/mounts.h
-mount.o: ../core/mount.h ../core/users.h ../core/lastcontainer.h
-mount.o: ../core/groups.h ../core/loadavg.h ../core/sessionmanager.h
-mount.o: ../core/sessioncontainer.h ../core/system.h ../core/misc.h
+mount.o: ../core/mount.h ../core/mountparser.h ../core/users.h
+mount.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
+mount.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h
+mount.o: ../core/misc.h
 patterncacher.o: patterncacher.h ../core/item.h ../../ezc/src/ezc.h
 patterncacher.o: ../core/log.h
 priv.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h misc.h
@@ -141,12 +143,12 @@ priv.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/config.h
 priv.o: ../core/db.h ../core/group.h ../core/thread.h ../core/dircontainer.h
 priv.o: ../core/ugcontainer.h ../core/ticket.h ../core/system.h
 priv.o: ../core/dirs.h ../core/db.h ../core/request.h ../core/mounts.h
-priv.o: ../core/mount.h ../core/users.h ../core/lastcontainer.h
-priv.o: ../core/groups.h ../core/loadavg.h ../core/sessionmanager.h
-priv.o: ../core/sessioncontainer.h ../core/system.h ../core/misc.h
-priv.o: ../functions/functions.h ../functions/functionbase.h ../core/item.h
-priv.o: ../core/notify.h ../templatesnotify/templatesnotify.h ../core/mount.h
-priv.o: ../templates/misc.h ../functions/functionparser.h
+priv.o: ../core/mount.h ../core/mountparser.h ../core/users.h
+priv.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
+priv.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h
+priv.o: ../core/misc.h ../functions/functions.h ../functions/functionbase.h
+priv.o: ../core/item.h ../core/notify.h ../templatesnotify/templatesnotify.h
+priv.o: ../core/mount.h ../templates/misc.h ../functions/functionparser.h
 priv.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h
 priv.o: ../functions/privchanger.h ../functions/chown.h
 priv.o: ../functions/ckeditor.h ../functions/cp.h ../functions/createthread.h
@@ -170,9 +172,9 @@ rebus.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/config.h
 rebus.o: ../core/db.h ../core/group.h ../core/thread.h ../core/dircontainer.h
 rebus.o: ../core/ugcontainer.h ../core/ticket.h ../core/system.h
 rebus.o: ../core/dirs.h ../core/db.h ../core/request.h ../core/mounts.h
-rebus.o: ../core/mount.h ../core/users.h ../core/lastcontainer.h
-rebus.o: ../core/groups.h ../core/loadavg.h ../core/sessionmanager.h
-rebus.o: ../core/sessioncontainer.h ../core/system.h
+rebus.o: ../core/mount.h ../core/mountparser.h ../core/users.h
+rebus.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
+rebus.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h
 sys.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h misc.h
 sys.o: localefilter.h ../core/locale.h ../core/confparser.h
 sys.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
@@ -183,9 +185,10 @@ sys.o: ../core/plugindata.h ../core/rebus.h ../core/config.h ../core/db.h
 sys.o: ../core/group.h ../core/thread.h ../core/dircontainer.h
 sys.o: ../core/ugcontainer.h ../core/ticket.h ../core/system.h ../core/dirs.h
 sys.o: ../core/db.h ../core/request.h ../core/mounts.h ../core/mount.h
-sys.o: ../core/users.h ../core/lastcontainer.h ../core/groups.h
-sys.o: ../core/loadavg.h ../core/sessionmanager.h ../core/sessioncontainer.h
-sys.o: ../core/system.h ../core/request.h ../core/version.h
+sys.o: ../core/mountparser.h ../core/users.h ../core/lastcontainer.h
+sys.o: ../core/groups.h ../core/loadavg.h ../core/sessionmanager.h
+sys.o: ../core/sessioncontainer.h ../core/system.h ../core/request.h
+sys.o: ../core/version.h
 template.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h
 template.o: misc.h localefilter.h ../core/locale.h ../core/confparser.h
 template.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
@@ -196,10 +199,10 @@ template.o: ../core/user.h ../core/plugindata.h ../core/rebus.h
 template.o: ../core/config.h ../core/db.h ../core/group.h ../core/thread.h
 template.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/ticket.h
 template.o: ../core/system.h ../core/dirs.h ../core/db.h ../core/request.h
-template.o: ../core/mounts.h ../core/mount.h ../core/users.h
-template.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
-template.o: ../core/sessionmanager.h ../core/sessioncontainer.h
-template.o: ../core/system.h ../core/misc.h
+template.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h
+template.o: ../core/users.h ../core/lastcontainer.h ../core/groups.h
+template.o: ../core/loadavg.h ../core/sessionmanager.h
+template.o: ../core/sessioncontainer.h ../core/system.h ../core/misc.h
 templates.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h
 templates.o: misc.h localefilter.h ../core/locale.h ../core/confparser.h
 templates.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
@@ -210,11 +213,11 @@ templates.o: ../core/user.h ../core/plugindata.h ../core/rebus.h
 templates.o: ../core/config.h ../core/db.h ../core/group.h ../core/thread.h
 templates.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/ticket.h
 templates.o: ../core/system.h ../core/dirs.h ../core/db.h ../core/request.h
-templates.o: ../core/mounts.h ../core/mount.h ../core/users.h
-templates.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
-templates.o: ../core/sessionmanager.h ../core/sessioncontainer.h
-templates.o: ../core/system.h ../core/misc.h ../core/plugin.h
-templates.o: ../core/pluginmsg.h ../core/sessionmanager.h
+templates.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h
+templates.o: ../core/users.h ../core/lastcontainer.h ../core/groups.h
+templates.o: ../core/loadavg.h ../core/sessionmanager.h
+templates.o: ../core/sessioncontainer.h ../core/system.h ../core/misc.h
+templates.o: ../core/plugin.h ../core/pluginmsg.h ../core/sessionmanager.h
 templates.o: ../functions/functions.h ../functions/functionbase.h
 templates.o: ../core/item.h ../core/notify.h
 templates.o: ../templatesnotify/templatesnotify.h ../core/mount.h
@@ -244,13 +247,13 @@ thread.o: ../core/user.h ../core/plugindata.h ../core/rebus.h
 thread.o: ../core/config.h ../core/db.h ../core/group.h ../core/thread.h
 thread.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/ticket.h
 thread.o: ../core/system.h ../core/dirs.h ../core/db.h ../core/request.h
-thread.o: ../core/mounts.h ../core/mount.h ../core/users.h
-thread.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
-thread.o: ../core/sessionmanager.h ../core/sessioncontainer.h
-thread.o: ../core/system.h ../core/misc.h ../functions/functions.h
-thread.o: ../functions/functionbase.h ../core/item.h ../core/notify.h
-thread.o: ../templatesnotify/templatesnotify.h ../core/mount.h
-thread.o: ../templates/misc.h ../functions/functionparser.h
+thread.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h
+thread.o: ../core/users.h ../core/lastcontainer.h ../core/groups.h
+thread.o: ../core/loadavg.h ../core/sessionmanager.h
+thread.o: ../core/sessioncontainer.h ../core/system.h ../core/misc.h
+thread.o: ../functions/functions.h ../functions/functionbase.h ../core/item.h
+thread.o: ../core/notify.h ../templatesnotify/templatesnotify.h
+thread.o: ../core/mount.h ../templates/misc.h ../functions/functionparser.h
 thread.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h
 thread.o: ../functions/privchanger.h ../functions/chown.h
 thread.o: ../functions/ckeditor.h ../functions/cp.h
@@ -275,13 +278,13 @@ ticket.o: ../core/user.h ../core/plugindata.h ../core/rebus.h
 ticket.o: ../core/config.h ../core/db.h ../core/group.h ../core/thread.h
 ticket.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/ticket.h
 ticket.o: ../core/system.h ../core/dirs.h ../core/db.h ../core/request.h
-ticket.o: ../core/mounts.h ../core/mount.h ../core/users.h
-ticket.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
-ticket.o: ../core/sessionmanager.h ../core/sessioncontainer.h
-ticket.o: ../core/system.h ../core/misc.h ../functions/functions.h
-ticket.o: ../functions/functionbase.h ../core/item.h ../core/notify.h
-ticket.o: ../templatesnotify/templatesnotify.h ../core/mount.h
-ticket.o: ../templates/misc.h ../functions/functionparser.h
+ticket.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h
+ticket.o: ../core/users.h ../core/lastcontainer.h ../core/groups.h
+ticket.o: ../core/loadavg.h ../core/sessionmanager.h
+ticket.o: ../core/sessioncontainer.h ../core/system.h ../core/misc.h
+ticket.o: ../functions/functions.h ../functions/functionbase.h ../core/item.h
+ticket.o: ../core/notify.h ../templatesnotify/templatesnotify.h
+ticket.o: ../core/mount.h ../templates/misc.h ../functions/functionparser.h
 ticket.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h
 ticket.o: ../functions/privchanger.h ../functions/chown.h
 ticket.o: ../functions/ckeditor.h ../functions/cp.h
@@ -306,10 +309,10 @@ upload.o: ../core/user.h ../core/plugindata.h ../core/rebus.h
 upload.o: ../core/config.h ../core/db.h ../core/group.h ../core/thread.h
 upload.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/ticket.h
 upload.o: ../core/system.h ../core/dirs.h ../core/db.h ../core/request.h
-upload.o: ../core/mounts.h ../core/mount.h ../core/users.h
-upload.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
-upload.o: ../core/sessionmanager.h ../core/sessioncontainer.h
-upload.o: ../core/system.h ../core/request.h
+upload.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h
+upload.o: ../core/users.h ../core/lastcontainer.h ../core/groups.h
+upload.o: ../core/loadavg.h ../core/sessionmanager.h
+upload.o: ../core/sessioncontainer.h ../core/system.h ../core/request.h
 uptime.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h
 uptime.o: misc.h localefilter.h ../core/locale.h ../core/confparser.h
 uptime.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
@@ -320,10 +323,10 @@ uptime.o: ../core/user.h ../core/plugindata.h ../core/rebus.h
 uptime.o: ../core/config.h ../core/db.h ../core/group.h ../core/thread.h
 uptime.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/ticket.h
 uptime.o: ../core/system.h ../core/dirs.h ../core/db.h ../core/request.h
-uptime.o: ../core/mounts.h ../core/mount.h ../core/users.h
-uptime.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
-uptime.o: ../core/sessionmanager.h ../core/sessioncontainer.h
-uptime.o: ../core/system.h
+uptime.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h
+uptime.o: ../core/users.h ../core/lastcontainer.h ../core/groups.h
+uptime.o: ../core/loadavg.h ../core/sessionmanager.h
+uptime.o: ../core/sessioncontainer.h ../core/system.h
 user.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h misc.h
 user.o: localefilter.h ../core/locale.h ../core/confparser.h
 user.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
@@ -334,10 +337,10 @@ user.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/config.h
 user.o: ../core/db.h ../core/group.h ../core/thread.h ../core/dircontainer.h
 user.o: ../core/ugcontainer.h ../core/ticket.h ../core/system.h
 user.o: ../core/dirs.h ../core/db.h ../core/request.h ../core/mounts.h
-user.o: ../core/mount.h ../core/users.h ../core/lastcontainer.h
-user.o: ../core/groups.h ../core/loadavg.h ../core/sessionmanager.h
-user.o: ../core/sessioncontainer.h ../core/system.h ../core/request.h
-user.o: ../core/misc.h
+user.o: ../core/mount.h ../core/mountparser.h ../core/users.h
+user.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
+user.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h
+user.o: ../core/request.h ../core/misc.h
 who.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h misc.h
 who.o: localefilter.h ../core/locale.h ../core/confparser.h
 who.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
@@ -348,9 +351,9 @@ who.o: ../core/plugindata.h ../core/rebus.h ../core/config.h ../core/db.h
 who.o: ../core/group.h ../core/thread.h ../core/dircontainer.h
 who.o: ../core/ugcontainer.h ../core/ticket.h ../core/system.h ../core/dirs.h
 who.o: ../core/db.h ../core/request.h ../core/mounts.h ../core/mount.h
-who.o: ../core/users.h ../core/lastcontainer.h ../core/groups.h
-who.o: ../core/loadavg.h ../core/sessionmanager.h ../core/sessioncontainer.h
-who.o: ../core/system.h ../core/misc.h
+who.o: ../core/mountparser.h ../core/users.h ../core/lastcontainer.h
+who.o: ../core/groups.h ../core/loadavg.h ../core/sessionmanager.h
+who.o: ../core/sessioncontainer.h ../core/system.h ../core/misc.h
 winix.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h
 winix.o: misc.h localefilter.h ../core/locale.h ../core/confparser.h
 winix.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
@@ -361,12 +364,12 @@ winix.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/config.h
 winix.o: ../core/db.h ../core/group.h ../core/thread.h ../core/dircontainer.h
 winix.o: ../core/ugcontainer.h ../core/ticket.h ../core/system.h
 winix.o: ../core/dirs.h ../core/db.h ../core/request.h ../core/mounts.h
-winix.o: ../core/mount.h ../core/users.h ../core/lastcontainer.h
-winix.o: ../core/groups.h ../core/loadavg.h ../core/sessionmanager.h
-winix.o: ../core/sessioncontainer.h ../core/system.h ../functions/functions.h
-winix.o: ../functions/functionbase.h ../core/item.h ../core/notify.h
-winix.o: ../templatesnotify/templatesnotify.h ../core/mount.h
-winix.o: ../templates/misc.h ../functions/functionparser.h
+winix.o: ../core/mount.h ../core/mountparser.h ../core/users.h
+winix.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
+winix.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h
+winix.o: ../functions/functions.h ../functions/functionbase.h ../core/item.h
+winix.o: ../core/notify.h ../templatesnotify/templatesnotify.h
+winix.o: ../core/mount.h ../templates/misc.h ../functions/functionparser.h
 winix.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h
 winix.o: ../functions/privchanger.h ../functions/chown.h
 winix.o: ../functions/ckeditor.h ../functions/cp.h
diff --git a/templates/mount.cpp b/templates/mount.cpp
index 212c1f3..b4cdd8f 100755
--- a/templates/mount.cpp
+++ b/templates/mount.cpp
@@ -20,42 +20,42 @@ namespace TemplatesFunctions
 
 void mount_page_is(Info & i)
 {
-	i.res = system->mounts.pmount->IsArg(Mount::par_page, i.par);
+	i.res = system->mounts.pmount->IsArg(system->mounts.MountParPage(), i.par);
 }
 
 
 void mount_thread_is(Info & i)
 {
-	i.res = system->mounts.pmount->IsArg(Mount::par_thread, i.par);
+	i.res = system->mounts.pmount->IsArg(system->mounts.MountParThread(), i.par);
 }
 
 
 void mount_type_is_thread(Info & i)
 {
-	i.res = system->mounts.pmount->type == Mount::thread;
+	i.res = system->mounts.pmount->type == system->mounts.MountTypeThread();
 }
 
 
 void mount_type_is_ticket(Info & i)
 {
-	i.res = system->mounts.pmount->type == Mount::ticket;
+	i.res = system->mounts.pmount->type == system->mounts.MountTypeTicket();
 }
 
 
 void mount_type_is_cms(Info & i)
 {
-	i.res = system->mounts.pmount->type == Mount::cms;	
+	i.res = system->mounts.pmount->type == system->mounts.MountTypeCms();	
 }
 
 void mount_has_html_template(Info & i)
 {
-	i.res = system->mounts.pmount->param[Mount::par_html_template].defined;
+	i.res = system->mounts.pmount->param[system->mounts.MountParHtmlTemplate()].defined;
 }
 
 
 void mount_first_html_template(Info & i)
 {
-	Mount::ParamRow & par = system->mounts.pmount->param[Mount::par_html_template];
+	Mount::ParamRow & par = system->mounts.pmount->param[system->mounts.MountParHtmlTemplate()];
 
 	if( par.defined && !par.arg.empty() )
 		HtmlEscape(i.out, par.arg[0]);
diff --git a/templates/template.cpp b/templates/template.cpp
index fdaf86e..cef202f 100755
--- a/templates/template.cpp
+++ b/templates/template.cpp
@@ -66,7 +66,7 @@ void template_init()
 	temp_tab.clear();
 	temp_tab.push_back(config->templates_index);
 
-	Mount::ParamRow & par = system->mounts.pmount->param[Mount::par_html_template];
+	Mount::ParamRow & par = system->mounts.pmount->param[system->mounts.MountParHtmlTemplate()];
 
 	if( par.defined )
 	{
diff --git a/templates/templates.cpp b/templates/templates.cpp
index 555621b..480c66b 100755
--- a/templates/templates.cpp
+++ b/templates/templates.cpp
@@ -574,15 +574,15 @@ using namespace TemplatesFunctions;
 	{
 		const Mount & mount = i->second;
 
-		if( mount.param[Mount::par_html_template].defined )
+		if( mount.param[TemplatesFunctions::system->mounts.MountParHtmlTemplate()].defined )
 		{
-			size_t len = mount.param[Mount::par_html_template].arg.size();
+			size_t len = mount.param[TemplatesFunctions::system->mounts.MountParHtmlTemplate()].arg.size();
 			size_t a;
 
 			// loop through all html_templates() values
 			for(a=0 ; a<len ; ++a)
 			{
-				const std::string & file_name = mount.param[Mount::par_html_template].arg[a];
+				const std::string & file_name = mount.param[TemplatesFunctions::system->mounts.MountParHtmlTemplate()].arg[a];
 
 				if( add_pattern )
 					index_patterns.AddPatternIfNotExists(file_name, locale, locale_filter, false); // file pattern will be unmarked
@@ -628,7 +628,14 @@ using namespace TemplatesFunctions;
 
 
 	if( !index_file_local )
-		index_file_local = TemplatesFunctions::system->mounts.pmount->FirstHtmlTemplate();
+	{
+		const std::string & temp = TemplatesFunctions::system->mounts.pmount->FirstArg(
+										TemplatesFunctions::system->mounts.MountParHtmlTemplate() );
+
+		if( !temp.empty() )
+			index_file_local = &temp;
+
+	}
 
 
 	if( index_file_local && *index_file_local != config->templates_index )
diff --git a/templates/ticket.cpp b/templates/ticket.cpp
index 75b628b..a444edb 100755
--- a/templates/ticket.cpp
+++ b/templates/ticket.cpp
@@ -74,36 +74,36 @@ void ticket_can_edit(Info & i)
 
 void ticket_type(Info & i)
 {
-	if( functions->fun_ticket.ticket.type < system->mounts.pmount->param[Mount::par_ticket_type].arg.size() )
-		HtmlEscape(i.out, system->mounts.pmount->param[Mount::par_ticket_type].arg[functions->fun_ticket.ticket.type]);
+	if( functions->fun_ticket.ticket.type < system->mounts.pmount->param[system->mounts.MountParTicketType()].arg.size() )
+		HtmlEscape(i.out, system->mounts.pmount->param[system->mounts.MountParTicketType()].arg[functions->fun_ticket.ticket.type]);
 }
 
 
 void ticket_status(Info & i)
 {
-	if( functions->fun_ticket.ticket.status < system->mounts.pmount->param[Mount::par_ticket_status].arg.size() )
-		HtmlEscape(i.out, system->mounts.pmount->param[Mount::par_ticket_status].arg[functions->fun_ticket.ticket.status]);
+	if( functions->fun_ticket.ticket.status < system->mounts.pmount->param[system->mounts.MountParTicketStatus()].arg.size() )
+		HtmlEscape(i.out, system->mounts.pmount->param[system->mounts.MountParTicketStatus()].arg[functions->fun_ticket.ticket.status]);
 }
 
 	
 void ticket_priority(Info & i)
 {
-	if( functions->fun_ticket.ticket.priority < system->mounts.pmount->param[Mount::par_ticket_priority].arg.size() )
-		HtmlEscape(i.out, system->mounts.pmount->param[Mount::par_ticket_priority].arg[functions->fun_ticket.ticket.priority]);
+	if( functions->fun_ticket.ticket.priority < system->mounts.pmount->param[system->mounts.MountParTicketPriority()].arg.size() )
+		HtmlEscape(i.out, system->mounts.pmount->param[system->mounts.MountParTicketPriority()].arg[functions->fun_ticket.ticket.priority]);
 }
 
 
 void ticket_category(Info & i)
 {
-	if( functions->fun_ticket.ticket.category < system->mounts.pmount->param[Mount::par_ticket_category].arg.size() )
-		HtmlEscape(i.out, system->mounts.pmount->param[Mount::par_ticket_category].arg[functions->fun_ticket.ticket.category]);
+	if( functions->fun_ticket.ticket.category < system->mounts.pmount->param[system->mounts.MountParTicketCategory()].arg.size() )
+		HtmlEscape(i.out, system->mounts.pmount->param[system->mounts.MountParTicketCategory()].arg[functions->fun_ticket.ticket.category]);
 }
 
 
 void ticket_expected(Info & i)
 {
-	if( functions->fun_ticket.ticket.expected < system->mounts.pmount->param[Mount::par_ticket_expected].arg.size() )
-		HtmlEscape(i.out, system->mounts.pmount->param[Mount::par_ticket_expected].arg[functions->fun_ticket.ticket.expected]);
+	if( functions->fun_ticket.ticket.expected < system->mounts.pmount->param[system->mounts.MountParTicketExpected()].arg.size() )
+		HtmlEscape(i.out, system->mounts.pmount->param[system->mounts.MountParTicketExpected()].arg[functions->fun_ticket.ticket.expected]);
 }
 
 
@@ -235,8 +235,8 @@ void ticket_tab_type(Info & i)
 
 	Ticket & t = functions->fun_ticket.ticket_tab[ticket_tab_index];
 
-	if( t.type < system->mounts.pmount->param[Mount::par_ticket_type].arg.size() )
-		HtmlEscape(i.out, system->mounts.pmount->param[Mount::par_ticket_type].arg[t.type]);
+	if( t.type < system->mounts.pmount->param[system->mounts.MountParTicketType()].arg.size() )
+		HtmlEscape(i.out, system->mounts.pmount->param[system->mounts.MountParTicketType()].arg[t.type]);
 }
 
 
@@ -247,8 +247,8 @@ void ticket_tab_status(Info & i)
 
 	Ticket & t = functions->fun_ticket.ticket_tab[ticket_tab_index];
 
-	if( t.status < system->mounts.pmount->param[Mount::par_ticket_status].arg.size() )
-		HtmlEscape(i.out, system->mounts.pmount->param[Mount::par_ticket_status].arg[t.status]);
+	if( t.status < system->mounts.pmount->param[system->mounts.MountParTicketStatus()].arg.size() )
+		HtmlEscape(i.out, system->mounts.pmount->param[system->mounts.MountParTicketStatus()].arg[t.status]);
 }
 
 	
@@ -259,8 +259,8 @@ void ticket_tab_priority(Info & i)
 
 	Ticket & t = functions->fun_ticket.ticket_tab[ticket_tab_index];
 
-	if( t.priority < system->mounts.pmount->param[Mount::par_ticket_priority].arg.size() )
-		HtmlEscape(i.out, system->mounts.pmount->param[Mount::par_ticket_priority].arg[t.priority]);
+	if( t.priority < system->mounts.pmount->param[system->mounts.MountParTicketPriority()].arg.size() )
+		HtmlEscape(i.out, system->mounts.pmount->param[system->mounts.MountParTicketPriority()].arg[t.priority]);
 }
 
 
@@ -271,8 +271,8 @@ void ticket_tab_category(Info & i)
 
 	Ticket & t = functions->fun_ticket.ticket_tab[ticket_tab_index];
 
-	if( t.category < system->mounts.pmount->param[Mount::par_ticket_category].arg.size() )
-		HtmlEscape(i.out, system->mounts.pmount->param[Mount::par_ticket_category].arg[t.category]);
+	if( t.category < system->mounts.pmount->param[system->mounts.MountParTicketCategory()].arg.size() )
+		HtmlEscape(i.out, system->mounts.pmount->param[system->mounts.MountParTicketCategory()].arg[t.category]);
 }
 
 
@@ -283,8 +283,8 @@ void ticket_tab_expected(Info & i)
 
 	Ticket & t = functions->fun_ticket.ticket_tab[ticket_tab_index];
 
-	if( t.expected < system->mounts.pmount->param[Mount::par_ticket_expected].arg.size() )
-		HtmlEscape(i.out, system->mounts.pmount->param[Mount::par_ticket_expected].arg[t.expected]);
+		if( t.expected < system->mounts.pmount->param[system->mounts.MountParTicketExpected()].arg.size() )
+		HtmlEscape(i.out, system->mounts.pmount->param[system->mounts.MountParTicketExpected()].arg[t.expected]);
 }
 
 
@@ -317,13 +317,13 @@ void ticket_type_tab(Info & i)
 {
 	ticket_type_tab_ind = i.iter;
 
-	i.res = ticket_type_tab_ind < system->mounts.pmount->param[Mount::par_ticket_type].arg.size();
+	i.res = ticket_type_tab_ind < system->mounts.pmount->param[system->mounts.MountParTicketType()].arg.size();
 }
 
 
 void ticket_type_tab_defined(Info & i)
 {
-	i.res = system->mounts.pmount->param[Mount::par_ticket_type].defined;
+	i.res = system->mounts.pmount->param[system->mounts.MountParTicketType()].defined;
 }
 
 
@@ -335,7 +335,7 @@ void ticket_type_tab_isdefault(Info & i)
 	}
 	else
 	{
-		Mount::ParamRow & p = system->mounts.pmount->param[Mount::par_ticket_type_default];
+		Mount::ParamRow & p = system->mounts.pmount->param[system->mounts.MountParTicketTypeDefault()];
 
 		if( !p.defined || p.arg.empty() )
 			return; // default false
@@ -354,8 +354,8 @@ void ticket_type_tab_index(Info & i)
 
 void ticket_type_tab_name(Info & i)
 {
-	if( ticket_type_tab_ind < system->mounts.pmount->param[Mount::par_ticket_type].arg.size() )
-		HtmlEscape(i.out, system->mounts.pmount->param[Mount::par_ticket_type].arg[ticket_type_tab_ind]);
+	if( ticket_type_tab_ind < system->mounts.pmount->param[system->mounts.MountParTicketType()].arg.size() )
+		HtmlEscape(i.out, system->mounts.pmount->param[system->mounts.MountParTicketType()].arg[ticket_type_tab_ind]);
 }
 
 
@@ -369,13 +369,13 @@ void ticket_status_tab(Info & i)
 {
 	ticket_status_tab_ind = i.iter;
 
-	i.res = ticket_status_tab_ind < system->mounts.pmount->param[Mount::par_ticket_status].arg.size();
+	i.res = ticket_status_tab_ind < system->mounts.pmount->param[system->mounts.MountParTicketStatus()].arg.size();
 }
 
 
 void ticket_status_tab_defined(Info & i)
 {
-	i.res = system->mounts.pmount->param[Mount::par_ticket_status].defined;
+	i.res = system->mounts.pmount->param[system->mounts.MountParTicketStatus()].defined;
 }
 
 
@@ -387,7 +387,7 @@ void ticket_status_tab_isdefault(Info & i)
 	}
 	else
 	{
-		Mount::ParamRow & p = system->mounts.pmount->param[Mount::par_ticket_status_default];
+		Mount::ParamRow & p = system->mounts.pmount->param[system->mounts.MountParTicketStatusDefault()];
 
 		if( !p.defined || p.arg.empty() )
 			return; // default false
@@ -406,8 +406,8 @@ void ticket_status_tab_index(Info & i)
 
 void ticket_status_tab_name(Info & i)
 {
-	if( ticket_status_tab_ind < system->mounts.pmount->param[Mount::par_ticket_status].arg.size() )
-		HtmlEscape(i.out, system->mounts.pmount->param[Mount::par_ticket_status].arg[ticket_status_tab_ind]);
+	if( ticket_status_tab_ind < system->mounts.pmount->param[system->mounts.MountParTicketStatus()].arg.size() )
+		HtmlEscape(i.out, system->mounts.pmount->param[system->mounts.MountParTicketStatus()].arg[ticket_status_tab_ind]);
 }
 
 
@@ -420,13 +420,13 @@ void ticket_priority_tab(Info & i)
 {
 	ticket_priority_tab_ind = i.iter;
 
-	i.res = ticket_priority_tab_ind < system->mounts.pmount->param[Mount::par_ticket_priority].arg.size();
+	i.res = ticket_priority_tab_ind < system->mounts.pmount->param[system->mounts.MountParTicketPriority()].arg.size();
 }
 
 
 void ticket_priority_tab_defined(Info & i)
 {
-	i.res = system->mounts.pmount->param[Mount::par_ticket_priority].defined;
+	i.res = system->mounts.pmount->param[system->mounts.MountParTicketPriority()].defined;
 }
 
 
@@ -438,7 +438,7 @@ void ticket_priority_tab_isdefault(Info & i)
 	}
 	else
 	{
-		Mount::ParamRow & p = system->mounts.pmount->param[Mount::par_ticket_priority_default];
+		Mount::ParamRow & p = system->mounts.pmount->param[system->mounts.MountParTicketPriorityDefault()];
 
 		if( !p.defined || p.arg.empty() )
 			return; // default false
@@ -457,8 +457,8 @@ void ticket_priority_tab_index(Info & i)
 
 void ticket_priority_tab_name(Info & i)
 {
-	if( ticket_priority_tab_ind < system->mounts.pmount->param[Mount::par_ticket_priority].arg.size() )
-		HtmlEscape(i.out, system->mounts.pmount->param[Mount::par_ticket_priority].arg[ticket_priority_tab_ind]);
+	if( ticket_priority_tab_ind < system->mounts.pmount->param[system->mounts.MountParTicketPriority()].arg.size() )
+		HtmlEscape(i.out, system->mounts.pmount->param[system->mounts.MountParTicketPriority()].arg[ticket_priority_tab_ind]);
 }
 
 
@@ -471,13 +471,13 @@ void ticket_category_tab(Info & i)
 {
 	ticket_category_tab_ind = i.iter;
 
-	i.res = ticket_category_tab_ind < system->mounts.pmount->param[Mount::par_ticket_category].arg.size();
+	i.res = ticket_category_tab_ind < system->mounts.pmount->param[system->mounts.MountParTicketCategory()].arg.size();
 }
 
 
 void ticket_category_tab_defined(Info & i)
 {
-	i.res = system->mounts.pmount->param[Mount::par_ticket_category].defined;
+	i.res = system->mounts.pmount->param[system->mounts.MountParTicketCategory()].defined;
 }
 
 
@@ -489,7 +489,7 @@ void ticket_category_tab_isdefault(Info & i)
 	}
 	else
 	{
-		Mount::ParamRow & p = system->mounts.pmount->param[Mount::par_ticket_category_default];
+		Mount::ParamRow & p = system->mounts.pmount->param[system->mounts.MountParTicketCategoryDefault()];
 
 		if( !p.defined || p.arg.empty() )
 			return; // default false
@@ -508,8 +508,8 @@ void ticket_category_tab_index(Info & i)
 
 void ticket_category_tab_name(Info & i)
 {
-	if( ticket_category_tab_ind < system->mounts.pmount->param[Mount::par_ticket_category].arg.size() )
-		HtmlEscape(i.out, system->mounts.pmount->param[Mount::par_ticket_category].arg[ticket_category_tab_ind]);
+	if( ticket_category_tab_ind < system->mounts.pmount->param[system->mounts.MountParTicketCategory()].arg.size() )
+		HtmlEscape(i.out, system->mounts.pmount->param[system->mounts.MountParTicketCategory()].arg[ticket_category_tab_ind]);
 }
 
 
@@ -523,13 +523,13 @@ void ticket_expected_tab(Info & i)
 {
 	ticket_expected_tab_ind = i.iter;
 
-	i.res = ticket_expected_tab_ind < system->mounts.pmount->param[Mount::par_ticket_expected].arg.size();
+	i.res = ticket_expected_tab_ind < system->mounts.pmount->param[system->mounts.MountParTicketExpected()].arg.size();
 }
 
 
 void ticket_expected_tab_defined(Info & i)
 {
-	i.res = system->mounts.pmount->param[Mount::par_ticket_expected].defined;
+	i.res = system->mounts.pmount->param[system->mounts.MountParTicketExpected()].defined;
 }
 
 
@@ -541,7 +541,7 @@ void ticket_expected_tab_isdefault(Info & i)
 	}
 	else
 	{
-		Mount::ParamRow & p = system->mounts.pmount->param[Mount::par_ticket_expected_default];
+		Mount::ParamRow & p = system->mounts.pmount->param[system->mounts.MountParTicketExpectedDefault()];
 
 		if( !p.defined || p.arg.empty() )
 			return; // default false
@@ -560,8 +560,8 @@ void ticket_expected_tab_index(Info & i)
 
 void ticket_expected_tab_name(Info & i)
 {
-	if( ticket_expected_tab_ind < system->mounts.pmount->param[Mount::par_ticket_expected].arg.size() )
-		HtmlEscape(i.out, system->mounts.pmount->param[Mount::par_ticket_expected].arg[ticket_expected_tab_ind]);
+	if( ticket_expected_tab_ind < system->mounts.pmount->param[system->mounts.MountParTicketExpected()].arg.size() )
+		HtmlEscape(i.out, system->mounts.pmount->param[system->mounts.MountParTicketExpected()].arg[ticket_expected_tab_ind]);
 }
 
 
diff --git a/templatesnotify/Makefile.dep b/templatesnotify/Makefile.dep
index 2f135ad..c24a6f6 100755
--- a/templatesnotify/Makefile.dep
+++ b/templatesnotify/Makefile.dep
@@ -10,8 +10,9 @@ notify.o: ../core/error.h ../core/log.h ../core/user.h ../core/plugindata.h
 notify.o: ../core/rebus.h ../core/config.h ../core/system.h ../core/dirs.h
 notify.o: ../core/dircontainer.h ../core/db.h ../core/group.h
 notify.o: ../core/thread.h ../core/ugcontainer.h ../core/ticket.h
-notify.o: ../core/mounts.h ../core/mount.h ../core/users.h
-notify.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
+notify.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h
+notify.o: ../core/users.h ../core/lastcontainer.h ../core/groups.h
+notify.o: ../core/loadavg.h
 templatesnotify.o: templatesnotify.h ../../ezc/src/ezc.h ../core/mount.h
 templatesnotify.o: ../core/locale.h ../core/confparser.h ../core/config.h
 templatesnotify.o: ../core/htmlfilter.h ../templates/misc.h
diff --git a/templatesnotify/notify.cpp b/templatesnotify/notify.cpp
index f8e49e9..8c94f55 100755
--- a/templatesnotify/notify.cpp
+++ b/templatesnotify/notify.cpp
@@ -11,11 +11,11 @@
 #include "../core/notify.h"
 
 
+
 namespace TemplatesNotifyFunctions
 {
 
 
-
 void notify_item_added(Info & i)
 {
 	i.res = (notify_msg->notify_code & WINIX_NOTIFY_ITEM_ADD) != 0;
@@ -52,17 +52,19 @@ void notify_to(Info & i)
 
 void notify_mount_type_is_thread(Info & i)
 {
-	i.res = notify_msg->current_mount_type == Mount::thread;
+	i.res = notify_msg->current_mount_type == mount_type_thread;
 }
 
+
 void notify_mount_type_is_ticket(Info & i)
 {
-	i.res = notify_msg->current_mount_type == Mount::ticket;
+	i.res = notify_msg->current_mount_type == mount_type_ticket;
 }
 
+
 void notify_mount_type_is_cms(Info & i)
 {
-	i.res = notify_msg->current_mount_type == Mount::cms;
+	i.res = notify_msg->current_mount_type == mount_type_cms;
 }
 
 
diff --git a/templatesnotify/templatesnotify.cpp b/templatesnotify/templatesnotify.cpp
index 54aaacb..77f34d7 100755
--- a/templatesnotify/templatesnotify.cpp
+++ b/templatesnotify/templatesnotify.cpp
@@ -15,9 +15,16 @@
 
 
 
+
 namespace TemplatesNotifyFunctions
 {
 
+// id of mount points types
+int mount_type_cms;
+int mount_type_thread;
+int mount_type_ticket;
+
+
 Patterns       patterns;
 Ezc::Functions ezc_functions;
 Locale         locale;
@@ -40,13 +47,21 @@ void TemplatesNotify::SetConfig(Config * pconfig)
 	TemplatesNotifyFunctions::config = pconfig;
 }
 
+void TemplatesNotify::SetMountTypes(int mcms, int mthread, int mticket)
+{
+using namespace TemplatesNotifyFunctions;
+	
+	mount_type_cms    = mcms;
+	mount_type_thread = mthread;
+	mount_type_ticket = mticket;
+}
 
 
 
 void TemplatesNotify::CreateFunctions()
 {
 using namespace TemplatesNotifyFunctions;
-	
+
 	ezc_functions.Clear();
 
 	ezc_functions.Insert("notify_item_added",       notify_item_added);
diff --git a/templatesnotify/templatesnotify.h b/templatesnotify/templatesnotify.h
index 8fe2cc2..97bd71f 100755
--- a/templatesnotify/templatesnotify.h
+++ b/templatesnotify/templatesnotify.h
@@ -25,7 +25,7 @@ struct NotifyMsg
 {
 	std::string email;
 	int notify_code;
-	Mount::Type current_mount_type;
+	int current_mount_type;
 	Locale::Lang lang;
 	std::string doc_base_url;
 	std::string item_dir;
@@ -35,6 +35,11 @@ struct NotifyMsg
 
 namespace TemplatesNotifyFunctions
 {
+	extern int mount_type_cms;
+	extern int mount_type_thread;
+	extern int mount_type_ticket;
+
+
 	using Ezc::Info;
 	
 	enum Pat {
@@ -74,6 +79,7 @@ public:
 	TemplatesNotify();
 
 	void SetConfig(Config * pconfig);
+	void SetMountTypes(int mcms, int mthread, int mticket);
 
 	void Read();
 	void CreateFunctions();