v0.4 - Added index builder