Added bottle templating