Added workspace saving