Refactoring of route and ORTC handlers