Updated client methods to more appropriate