updated for compass_ae_saas changes