More work on schema.