Add support for File-PO(T) combination