Reworked WorldFactory.