fixed mapping issue in AssociationAgentHelper
some reconstruction to more cleaner code (not less)