Additional refinements on class & property detection and presentation