Update distribution protocol code as per review comments