Refactor xrm association load