Change to arc-standard parsing