Updating to Proto 4