Updated order manager