Added some CR comments to schema