Initial changes for Client integration