Align the AP Engaged arguments