Improve workspace keys