World and WorldFactory changes