Align the ADE with the current requirements

JIRA: SB-3515