Changed some models