Beta 2: Added Uruguay + fix for Peru