Added new vendor extends and reordered snippets