Added support for blank names from user