ECDR-3: Adding exi support to OS endpoint.