PIM-3368 : re-work the association transformer