Cleaning up the router of com_wrapper
Merge pull request #5510 from Hackwar/com_wrapper_router

Cleaning up the router of com_wrapper