Removed references to scope in data model; TODO rename scope to context in processing model