Fixed Arena class and partly fixed serialisation