Adapt to new protocol

Change-Id: I737154474d4b7cb5f03b524ccd0d59b5826c5e67