Adding handling for 'companies' data