Add support for EBI1 D/S