UC-1745:  Implemented routing logic