More protocol refinement