Moved to a protobuf based key/col