Changeset 4

Updated data model to fit new dictionary / actual value mapping.