Add TODO plugins and additional snippets with correct variable use