Fixed class declarations