Add cr remarks Improve specs according to the review Fix schema Add cr remarks Fix naming Add cr remarks