DataDictionary transformation updated according to remarks in issue #327