Continue implememting the protocol handling