Adding wunit support