More changes from __CLASS__