Added automatic name generation