Changed to use new arenas classes