Some schema changes/additions