Address Workspace and View deprecation errors