Forgotten classes added