Issue 11: Add similar support for snippets