Added: Property detection and class determination