Split World class.
Update fix.