Improve copy
Implement new protocol build mechanism