Split out PM and PA functionality into their own handlers