Reworked associations, now they work as they should