Added username and roles (non-profit vs superhero user)