EE 2.7.0 compatibility