Added targets, re-added snippets