Added to Client class