Updated Client class - now has username field