adding class support