Update for new ICU table scheme