Add hacky support for PDTS