Cluster Library consolidation 2