Fixed arena logic and class construction