Improved maps for EI scenario 1-3