Changed routing samples to use newer service