Some changes to adapt to the EOverP code