Upgraded main index to export a Database object