Making client immutable. minor commit.