modify c++ code to handle new workspace. #144