Updating Schema Definition and scripts