Added world support