WIP: fix schema.