This is the first work towards bug #7950.  The database tables have been changed, so that we can save the table entry.