Add missing extensions and fix order of list

This adds currently missing extensions from gerrit
This also corrects the order of the list

Change-Id: Ie34eea8587b4278eee34d074591b75c4e55c3a2e