Added user name capability