Changed organisation of PWM data structures