Add AP extraction.