Add PAPE support