Managing expanded class