Add/Fix clustering