Added support for adding a username