Adding in client state