Added username functionality