Update for EE 2.6+ compatibility