Additions for EE 2.7.1