Refactor out WorldContainer