Remove the use of global variable in ArenaMap
Change the class name