Updated for custom template snippets