Better support of workspace