Added class definitions.