Complete support of optional dependency on EL 3.0 implementation