Rolled back some changes, added Relationships