Added idea to prevent current autoloading problems
Continued implementation of new template handler