Add some associations support