Changed company_id to Text