Add support for clustering in the index to angle calculations