Routing efficiency/memory usage improvements