Fixed class declaration for three classes