Added class support