Added partial templating