Add class support