Add support for clusters and tracks.