Another snippets improvements