Worked more on index
Update schema
Merged