Updated to support new World model.