Updates to the data model objects.

Changes with the querying - some test code to debug an error that needs
to be cleaned up.