Added snippets, and key mappings