Updated structure and added snippets for use in snippets