[#1266] Updated the schema