Minor update to class definitions.