Could be done, but not as part of this PR - added to the Routing task list at #1552.