Workspace Changes in 9.1 version