Update to EE 2.8