-./inc/classes/main/template/class_BaseTemplateEngine.php:1274: // @TODO We need to find a fallback solution here
-./inc/classes/main/template/class_BaseTemplateEngine.php:769: * @todo Unfinished work or don't die here.
-./inc/classes/main/template/class_BaseTemplateEngine.php:940: * @todo Make this code some nicer...
-./inc/classes/main/template/image/class_ImageTemplateEngine.php:205: * @todo Find something usefull with this!
-./inc/classes/main/template/image/class_ImageTemplateEngine.php:225: * @todo Add cache creation here
-./inc/classes/main/template/mail/class_MailTemplateEngine.php:224: * @todo Add cache creation here
-./inc/classes/main/template/mail/class_MailTemplateEngine.php:234: * @todo Should we call back the mailer class here?
-./inc/classes/main/template/mail/class_MailTemplateEngine.php:315: * @todo 0% done
-./inc/classes/main/user/class_BaseUser.php:310: * @todo Try to make this method more generic so we can move it in BaseFrameworkSystem
+./inc/classes/main/template/class_BaseTemplateEngine.php:1307: // @TODO We need to find a fallback solution here
+./inc/classes/main/template/class_BaseTemplateEngine.php:814: * @todo Unfinished work or don't die here.
+./inc/classes/main/template/class_BaseTemplateEngine.php:831: // @TODO Non-string found so we need some deeper analysis...
+./inc/classes/main/template/class_BaseTemplateEngine.php:908: // @TODO Old behaviour, will become obsolete!
+./inc/classes/main/template/class_BaseTemplateEngine.php:911: // @TODO Yet another old way
+./inc/classes/main/template/class_BaseTemplateEngine.php:985: * @todo Make this code some nicer...
+./inc/classes/main/template/image/class_ImageTemplateEngine.php:229: * @todo Find something usefull with this!
+./inc/classes/main/template/image/class_ImageTemplateEngine.php:249: * @todo Add cache creation here
+./inc/classes/main/template/mail/class_MailTemplateEngine.php:234: * @todo Add cache creation here
+./inc/classes/main/template/mail/class_MailTemplateEngine.php:244: * @todo Should we call back the mailer class here?
+./inc/classes/main/template/mail/class_MailTemplateEngine.php:325: * @todo 0% done
+./inc/classes/main/user/class_BaseUser.php:309: * @todo Try to make this method more generic so we can move it in BaseFrameworkSystem