Messy commits, clean up later.
Rename DbModel to KvsFieldData.