Moving OrderPairTable to the resolver + hide translation complexity in OrderPair...