Switched to use protocol builder - fixes #4