Added More Arena Support