Adding more per-world support.