Prep work for EE3 api use