Changes to class declarations