Update for new international requirements