Refactors associations to instance level (Fixes #3)