Adding forgotten classes