Added define NON_MULTIPROVIDER_MENU