ARC'ified and modernized code base