Manually keeping schemas in sync

Even though it doesn't add much/any new functionality, keeping them
together will help sync'ing later on.