Move more methods to generated client