Modified snippets and added templates