added some more class support