Disambiguation of duplicate class names.
Corrected handling of entity and association sets
Chnaged property nmeta query to only return required properties.