EOS related changes for L2GW