Changed some model classes