More work on the database schema.