Support for new pwf