Added index construction

Not tested with Search yet