Adding world support