Some schema updates