Made some many-to-many relationships optional.