Some changes for using snippets