Changeset 5

Fixed bug in data model to allow for nullable dictionary values / ids.