Future pwf compatibility