Adding PAPI support