Added full support for multiple arenas (not fully tested!)