Added arena support