both: Update the workspace handlers to work with the new workspace model