[Comments]: some changes in schema