Added automatic determination of individual names.