#16 - Modify protocol structure definitions