Updated extensions to be non-vendor specific