Added NameData class and related code/traces