Extended the range of atom count features.