Align the ADE with current requirements

JIRA: SB-3515