Added / updated class headers.