Updated the IndexBuilder to be awesome