Add icons
Update protocol attributes to use underscore