Move to policy based routing