Add Client more specs