Added support for company name field