Add cluster functionality
Improve results