Added templating and more examples