Adding support for WSAT