Eva package dependency improvements