More changes to adapt to ARC 1.0.1