Make Order-Promotion bidirectional