Added workspace retrieval