Move clustering logic to metadata.

This is new metadata for new dataset.