Cluster Health and Optimize additions