Added username and more