Changed some model relationships, due to database changes.