Updated relationship between World and Zone classes