Template managment added