More class support