Chore/db associations dependencies