EE 2.6 Compatibility