Refactor some of the recent API chnanges to JarIndexer