Improved database schema.