Snippet enhancements