Merge "Added new schema" into release-1.1.0