Add Client class, remove Identity class and inject this into the Client instead