Switch to pg and add more associations