The map is frozen for EB, no further changes will be made. For EB2, we may look at this.