Updated some class definitions.