Added APC and File adapters