SomeImprovements
Some Improvements for WFS-T Module