DDF-574: Additions to wfssource and related files