added templating features