Updated to work with EE 2.9.0