Consolidated class libraries