Add Client type in a backward-compatible way
Use errors.New instead of fmt.Errorf