Improvements of snippets