Updates to World and Location classes