Update to include new APIs for the Framework.

Move initial database data to its own file.
Fix couple small bugs in the Client code that I found when testing.