Updated to support cluster module.