Tighten up data associations