added non-distinct metrics, and added info on -defined- props and classes