Continued protocol restructuring