Rework the relationships so that all of their composite key attributes
are independent. I believe this is causing problems for the runtime