added APC support