Changed some classes