Added per-world support, better metrics