Added support for storing usernames