Added new indexs for normalized companies
Changed adapter type
Merge branch 'master' into prod