Add schema changes resulting from commit 33ddbbeeccdde9b6933857659902bb69d5b752cf