Enhancements to wrap the protocol