Added basic world handling