Some changes in class definition