Bug 1097220 - Part 2: extend ClientsDatabase to support new optional fields.