Added more workspace retrieval