Minor changes in the way the class declarations occur