Enhance (future?) protobuf support