Updated world componet for v2