Enhancements for the built-in cluster module