Pulling in some changes to support client implementation