Updated to latest version of EL++