Updated to include a default template