Some more database design work.