First version of optional EL 3.0 implementation