Snippet improvements