Removed auto load of template classes, fixed missing csv enclosure on template add