Added new indexs for normalized companies
Changed adapter type