Update the schema some more, so that cross-refs and data are independent