Added basic templating capabilities