integrate AccountHelper into mapper