Simplify routing, add sim resolution trade