Adapt the protocol to better support None values