Added support for EE 2.8