Updated for mc-protocol-lib changes