Added cluster for better performance