Made some changes to the Client and the schema