Modify snippets, add some features