Updated code samples for EE 2.9