Make relavent changes for ShareServiceSocket refactor.