UC-1596:  Added WSRouter classes