Update to include default template