Updated for pwf-1.8