Pa plugin changes