Support for pwf-1.7