Further improvements to IndexDatabase