Added index build. #36