Added support for company_name, city, and state_name