Added username and token fields