Minor improvements
Added new snippets