Added templates for handler, viewer