Support new world format