Update schema
More work on issue #12