Added APC (also includes specific to bef.d7, which need to be removed later).