reworked associations & migrations