Moved Provider Type/Extension into columns of their own.