Updated templates to include partials