Added full support for ARC