Protocols improvment