Refactored protocol, builders updated