Added secondary associations, seems to work as expected.