AWE
CHG: Class scanner optimization