Added support for max CPU count