Refactor for new DSL
Refactor of the EGL with new DSL