Revert "rebase master - got updated schema"

This reverts commit 76dab29a6054a38e3e444a67155c9f9fa3dd0fc5.

The above commit erroneously reverted
1ac6d57077c8a196a4538151e2f5ca1deab7039d.