Refactors associations to instance level