Added getting username