Add special cases for PApp.