Some changes to class library