Prep work for EE3 api work