Add class support (buggy)