Improve workspace