Some fix + Added indexing of delta table