Changed package name and added ArenaManager