Do not fallback to the ws-require code
Restructure to include ws version of code