Start unifying some protocol handling