Update to new world manager