Adding composite primary keys to the association tables