OCD
Add Client class