Changed some relationships, added required fields.