Add wf2 specific modifications.