added apc support