Added seperation of concerns for workspace.