Improve ONExProtocol