Adds support for CompanyInfo NameValue pairs