Rearrange methods in Client