Better EEM Support