Many changes in classes