Added class for class data members