Add new version of IndexBuilder