Some more arena structure code