Added a couple more class headers.