Made some changes and added some relationships.