It looks that EL 3 introduced a lot of new classes that we have implemented on our own. We should consider removing our own implementations in favor of the ones of the standard.