Add dynamic clustering feature