Prepare for EF 98

Prepare for EF 98