Protocols style improvments