Updated schema

Hi Anil,

I have made some changes on the schema and also the code as per those changes. I have also provided the access to Confluence so that you can see the documents there. 

I am sending this pull request so that you can see what are the changes on the code.

Thanks
Sambhu