Updated snippets support