Modify client and storage servers for BCBG