Centralizing some path-making logic