Added APC support