Updated POP capability to include APOP.