Addedd support for PtP and Pd