Rewrite Routing component; add composite service