added support for WOs and PTRs